From 8829f5bf2b08b2b0c1b1dafdba8e2dc38b6165e2 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Mon, 2 Aug 2021 22:41:43 +0000 Subject: [PATCH 01/11] linux: 4.4.276 -> 4.4.277 (cherry picked from commit 7d0b3f65aa1eb7500e4638ceaa9770e86c07788c) --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 6c2595386e0..9f0f566494d 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,13 +1,13 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.4.276"; + version = "4.4.277"; extraMeta.branch = "4.4"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1hf9h5kr1ws2lvinzq6cv7aps8af1kx4q8j4bsk2vv4i2zvmfr7y"; + sha256 = "1m5zkssh523f15fvy80rcvfwqzdkldz3jhny6vbaj8q0zvk3w5r5"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_4 ]; From 2c47a4e052424af6b75c2bdf88ee02b220805ef5 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Mon, 2 Aug 2021 22:41:49 +0000 Subject: [PATCH 02/11] linux: 4.9.276 -> 4.9.277 (cherry picked from commit 32c78c9e12cfe3fed66c81ba47d575f365e25fd7) --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 0dc5cfeae6e..5d3a556da3d 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,13 +1,13 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.9.276"; + version = "4.9.277"; extraMeta.branch = "4.9"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "16jp05jhmqcp8lawqga69gxn1acdkxsskn3a6wf0635863fky3hv"; + sha256 = "1pkjcz9llc7hkmzfyjcx20b5njnqbkwlzyy1ncc8na71nn6rvsg6"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_9 ]; From 31b4f817e8f83b1b74588024cbc75c6f52187aed Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Mon, 2 Aug 2021 22:42:12 +0000 Subject: [PATCH 03/11] linux: 5.13.6 -> 5.13.7 (cherry picked from commit b4aa8884d19a3a10a57b836a089d0000188f284c) --- pkgs/os-specific/linux/kernel/linux-5.13.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.13.nix b/pkgs/os-specific/linux/kernel/linux-5.13.nix index bece15821a8..2f2dc1516b2 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.13.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.13.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.13.6"; + version = "5.13.7"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0xjjl8dmilp425b1cp977v26qxlg1147gh54kni949pzxwh1fb56"; + sha256 = "0fg41dv62vsnv2hywym15zz0n08rhdzwqvcarspm9r5gac85c7pr"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_13 ]; From f8aab36f815a1a3d7d6d97d950886a89bcec75a6 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Mon, 2 Aug 2021 22:42:45 +0000 Subject: [PATCH 04/11] linux_latest-libre: 18191 -> 18210 (cherry picked from commit e56d304d73b5415b8b08a91e04dc6807160bc84b) --- pkgs/os-specific/linux/kernel/linux-libre.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index f02c1ad1250..854218f74d8 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "18191"; - sha256 = "0ggaccg7z540kh5if48v6sjy39xllzvznqx5srvrlycrs2r89iyr"; + rev = "18210"; + sha256 = "1vp3d44ha68hhhk13g86j9lk0isfwqfkk1rbm0gihzjjzvpkxbab"; } , ... }: From 924971d8b89a17ac9aeaf5bce832dce733209fcd Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Tue, 20 Jul 2021 19:51:21 +0200 Subject: [PATCH 05/11] convos: 6.24 -> 6.26 (cherry picked from commit 21ba59294db9a3a0e4f7f1b39400a2f53b1d5186) --- pkgs/applications/networking/irc/convos/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/irc/convos/default.nix b/pkgs/applications/networking/irc/convos/default.nix index 8ff5c50b8a7..762fdf78ce3 100644 --- a/pkgs/applications/networking/irc/convos/default.nix +++ b/pkgs/applications/networking/irc/convos/default.nix @@ -6,13 +6,13 @@ with lib; perlPackages.buildPerlPackage rec { pname = "convos"; - version = "6.24"; + version = "6.26"; src = fetchFromGitHub { owner = "convos-chat"; repo = pname; rev = "v${version}"; - sha256 = "0hrz74fybypkjf9hraknylxrhnz7bhk00pk6wla2wfg8s2798zlx"; + sha256 = "1wh3ryhd4b7nanh0yp2nycmhky5afw8lpfx34858p6wfimsv9794"; }; nativeBuildInputs = [ makeWrapper ] From 4e4300ec8c755c187ec6112bc185905e4b320c4d Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Thu, 29 Jul 2021 14:12:54 +0200 Subject: [PATCH 06/11] perlPackages.LinkEmbedder: 1.18 -> 1.20 (cherry picked from commit 38357d7306de6e8178d374a161d1865d4fde6496) --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 9bf212761a9..7455e751ef2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11412,10 +11412,10 @@ let LinkEmbedder = buildPerlPackage { pname = "LinkEmbedder"; - version = "1.18"; + version = "1.20"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/LinkEmbedder-1.18.tar.gz"; - sha256 = "17gnixbawzr0r1k37dry7axb7ry6sj2xiahki28m8qbk1l69dfjz"; + url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/LinkEmbedder-1.20.tar.gz"; + sha256 = "19fwr3y8dd1bya2z86x3904s4dxfx15h7b777529j8n74m78ppmi"; }; buildInputs = [ TestDeep ]; propagatedBuildInputs = [ Mojolicious ]; From ebb083c259f5077e803188cfc3564ec5abe2096b Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Tue, 3 Aug 2021 23:05:12 +0200 Subject: [PATCH 07/11] putty: 0.75 -> 0.76 Fixes CVE-2021-36367. (cherry picked from commit e78c51a0e918cda218ff95b39ddeb7ddff5a5fde) --- pkgs/applications/networking/remote/putty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/remote/putty/default.nix b/pkgs/applications/networking/remote/putty/default.nix index aab30c24e20..6249cce973e 100644 --- a/pkgs/applications/networking/remote/putty/default.nix +++ b/pkgs/applications/networking/remote/putty/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - version = "0.75"; + version = "0.76"; pname = "putty"; src = fetchurl { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { "https://the.earth.li/~sgtatham/putty/${version}/${pname}-${version}.tar.gz" "ftp://ftp.wayne.edu/putty/putty-website-mirror/${version}/${pname}-${version}.tar.gz" ]; - sha256 = "1xgrr1fbirw79zafspg2b6crzfmlfw910y79md4r7gnxgq1kn5yk"; + sha256 = "0gvi8phabszqksj2by5jrjmshm7bpirhgavz0dqyz1xaimxdjz2l"; }; # glib-2.62 deprecations From 3f0926f6b562e516948607c110d0d18f8a3e2035 Mon Sep 17 00:00:00 2001 From: davidak Date: Sat, 24 Jul 2021 06:50:01 +0200 Subject: [PATCH 08/11] nixos-icons: fix icons not installed when documentation disabled (cherry picked from commit aa8373ab1b98b700c411eac1fe9e3d858a802909) --- nixos/modules/misc/documentation.nix | 3 +-- nixos/modules/services/x11/xserver.nix | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/misc/documentation.nix b/nixos/modules/misc/documentation.nix index c88cc693061..7e04f0f16a9 100644 --- a/nixos/modules/misc/documentation.nix +++ b/nixos/modules/misc/documentation.nix @@ -258,8 +258,7 @@ in environment.systemPackages = [] ++ optional cfg.man.enable manual.manpages - ++ optionals cfg.doc.enable ([ manual.manualHTML nixos-help ] - ++ optionals config.services.xserver.enable [ pkgs.nixos-icons ]); + ++ optionals cfg.doc.enable [ manual.manualHTML nixos-help ]; services.getty.helpLine = mkIf cfg.doc.enable ( "\nRun 'nixos-help' for the NixOS manual." diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index 4dde4476d2c..52af552cd13 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -651,6 +651,7 @@ in pkgs.xterm pkgs.xdg-utils xorg.xf86inputevdev.out # get evdev.4 man page + pkgs.nixos-icons # needed for gnome and pantheon about dialog, nixos-manual and maybe more ] ++ optional (elem "virtualbox" cfg.videoDrivers) xorg.xrefresh; From 43cea7b6e46b4e824f9a8b3b622f0e4a20f6d3f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 23 Jul 2021 08:02:40 +0200 Subject: [PATCH 09/11] python3Packages.gym: fix build Tested by running one of their code examples (cherry picked from commit 13cef561850fc6ee01de09f945c0e6047c26ef3c) --- pkgs/development/python-modules/gym/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/gym/default.nix b/pkgs/development/python-modules/gym/default.nix index a1cd76cd38e..08f248acd30 100644 --- a/pkgs/development/python-modules/gym/default.nix +++ b/pkgs/development/python-modules/gym/default.nix @@ -29,6 +29,11 @@ buildPythonPackage rec { scipy ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "Pillow<=8.2.0" "Pillow" + ''; + # The test needs MuJoCo that is not free library. doCheck = false; From 71c30320f9c12a96a8c4870239e6083f5ab8a688 Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Wed, 4 Aug 2021 15:03:40 +0200 Subject: [PATCH 10/11] glimpse: add graphviz as runtime dependency Fixes https://github.com/NixOS/nixpkgs/issues/132405 See also: https://gitlab.gnome.org/GNOME/gegl/-/issues/279 https://gitlab.gnome.org/GNOME/gimp/-/commit/f83fd22c4b8701ffc4ce14383e5e22756a4bce04 (cherry picked from commit 8d67153deb7d3a9d45f4735b1ca276de3a9499d6) --- pkgs/applications/graphics/glimpse/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/glimpse/default.nix b/pkgs/applications/graphics/glimpse/default.nix index de85fb9bf17..01271f53b57 100644 --- a/pkgs/applications/graphics/glimpse/default.nix +++ b/pkgs/applications/graphics/glimpse/default.nix @@ -51,6 +51,7 @@ , makeWrapper , autoreconfHook , gtk-doc +, graphviz }: let python = python2.withPackages (pp: [ pp.pygtk ]); @@ -154,7 +155,8 @@ stdenv.mkDerivation rec { postFixup = '' wrapProgram $out/bin/glimpse-${lib.versions.majorMinor version} \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix PATH ":" ${ lib.makeBinPath [ graphviz ] } ''; passthru = rec { From f187ac728a3e79dc15ffd3d1478234377dd45713 Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 20 Jul 2021 03:57:43 +0300 Subject: [PATCH 11/11] gollum: add additional dependencies (cherry picked from commit 3bdccfedaf0078eac4cae00e0646d8f0a8c1cfcf) --- pkgs/applications/misc/gollum/Gemfile | 6 ++ pkgs/applications/misc/gollum/Gemfile.lock | 22 +++++- pkgs/applications/misc/gollum/default.nix | 4 +- pkgs/applications/misc/gollum/gemset.nix | 92 ++++++++++++++++++++++ 4 files changed, 121 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/gollum/Gemfile b/pkgs/applications/misc/gollum/Gemfile index 525f54838b7..a15179970b3 100644 --- a/pkgs/applications/misc/gollum/Gemfile +++ b/pkgs/applications/misc/gollum/Gemfile @@ -1,2 +1,8 @@ source 'https://rubygems.org' gem 'gollum' + +gem 'asciidoctor' +gem 'creole' +gem 'wikicloth' +gem 'org-ruby' +gem 'RedCloth' diff --git a/pkgs/applications/misc/gollum/Gemfile.lock b/pkgs/applications/misc/gollum/Gemfile.lock index 73bc5d068d7..4d0d9adf772 100644 --- a/pkgs/applications/misc/gollum/Gemfile.lock +++ b/pkgs/applications/misc/gollum/Gemfile.lock @@ -1,9 +1,14 @@ GEM remote: https://rubygems.org/ specs: + RedCloth (4.3.2) + asciidoctor (2.0.15) + builder (3.2.4) concurrent-ruby (1.1.8) crass (1.0.6) + creole (0.5.0) execjs (2.7.0) + expression_parser (0.9.0) ffi (1.14.2) gemojione (4.3.3) json @@ -36,6 +41,7 @@ GEM gollum-rugged_adapter (1.0) mime-types (>= 1.15) rugged (~> 0.99) + htmlentities (4.3.4) json (2.5.1) kramdown (2.3.0) rexml @@ -59,6 +65,8 @@ GEM racc (~> 1.4) octicons (12.1.0) nokogiri (>= 1.6.3.1) + org-ruby (0.9.12) + rubypants (~> 0.2) racc (1.5.2) rack (2.2.3) rack-protection (2.1.0) @@ -71,6 +79,7 @@ GEM rss (0.2.9) rexml ruby2_keywords (0.0.4) + rubypants (0.7.1) rugged (0.99.0) sass (3.7.4) sass-listen (~> 4.0.0) @@ -105,12 +114,23 @@ GEM unf_ext unf_ext (0.0.7.7) useragent (0.16.10) + wikicloth (0.8.3) + builder + expression_parser + htmlentities + nokogiri + twitter-text PLATFORMS ruby DEPENDENCIES + RedCloth + asciidoctor + creole gollum + org-ruby + wikicloth BUNDLED WITH - 2.1.4 + 2.2.20 diff --git a/pkgs/applications/misc/gollum/default.nix b/pkgs/applications/misc/gollum/default.nix index 4a365b5a17e..59bb05f85ce 100644 --- a/pkgs/applications/misc/gollum/default.nix +++ b/pkgs/applications/misc/gollum/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, bundlerEnv, ruby, makeWrapper, bundlerUpdateScript -, git }: +, git, docutils, perl }: stdenv.mkDerivation rec { pname = "gollum"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { in '' mkdir -p $out/bin makeWrapper ${env}/bin/gollum $out/bin/gollum \ - --prefix PATH ":" ${lib.makeBinPath [ git ]} + --prefix PATH ":" ${lib.makeBinPath [ git docutils perl]} makeWrapper ${env}/bin/gollum-migrate-tags $out/bin/gollum-migrate-tags \ --prefix PATH ":" ${lib.makeBinPath [ git ]} ''; diff --git a/pkgs/applications/misc/gollum/gemset.nix b/pkgs/applications/misc/gollum/gemset.nix index 690eba645dc..8b0822d9a53 100644 --- a/pkgs/applications/misc/gollum/gemset.nix +++ b/pkgs/applications/misc/gollum/gemset.nix @@ -1,4 +1,24 @@ { + asciidoctor = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0k3lijm4dmiz977bfmpclk5glj5jwv7bidamwwwywm60ywb0n4n4"; + type = "gem"; + }; + version = "2.0.15"; + }; + builder = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "045wzckxpwcqzrjr353cxnyaxgf0qg22jh00dcx7z38cys5g1jlr"; + type = "gem"; + }; + version = "3.2.4"; + }; concurrent-ruby = { groups = ["default"]; platforms = []; @@ -19,6 +39,16 @@ }; version = "1.0.6"; }; + creole = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00rcscz16idp6dx0dk5yi5i0fz593i3r6anbn5bg2q07v3i025wm"; + type = "gem"; + }; + version = "0.5.0"; + }; execjs = { groups = ["default"]; platforms = []; @@ -29,6 +59,16 @@ }; version = "2.7.0"; }; + expression_parser = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1938z3wmmdabqxlh5d5c56xfg1jc6z15p7zjyhvk7364zwydnmib"; + type = "gem"; + }; + version = "0.9.0"; + }; ffi = { groups = ["default"]; platforms = []; @@ -93,6 +133,16 @@ }; version = "1.0"; }; + htmlentities = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nkklqsn8ir8wizzlakncfv42i32wc0w9hxp00hvdlgjr7376nhj"; + type = "gem"; + }; + version = "4.3.4"; + }; json = { groups = ["default"]; platforms = []; @@ -231,6 +281,17 @@ }; version = "12.1.0"; }; + org-ruby = { + dependencies = ["rubypants"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0x69s7aysfiwlcpd9hkvksfyld34d8kxr62adb59vjvh8hxfrjwk"; + type = "gem"; + }; + version = "0.9.12"; + }; racc = { groups = ["default"]; platforms = []; @@ -283,6 +344,16 @@ }; version = "0.10.1"; }; + RedCloth = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0m9dv7ya9q93r8x1pg2gi15rxlbck8m178j1fz7r5v6wr1avrrqy"; + type = "gem"; + }; + version = "4.3.2"; + }; rexml = { groups = ["default"]; platforms = []; @@ -324,6 +395,16 @@ }; version = "0.0.4"; }; + rubypants = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0kv2way45d2dz3h5b7wxyw36clvlwrz7ydf6699d0za5vm56gsrh"; + type = "gem"; + }; + version = "0.7.1"; + }; rugged = { groups = ["default"]; platforms = []; @@ -484,4 +565,15 @@ }; version = "0.16.10"; }; + wikicloth = { + dependencies = ["builder" "expression_parser" "htmlentities" "nokogiri" "twitter-text"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0c78r1rg93mb5rcrfxl01b162ma9sh46dhjksc4c9dngg62nhbjh"; + type = "gem"; + }; + version = "0.8.3"; + }; }