From d8e19a116feb931bc3329d409539dd53cee09f25 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Tue, 12 Jul 2022 20:10:29 -0400 Subject: [PATCH 01/52] range-v3: 0.11.0 -> 0.12.0 --- .../libraries/range-v3/default.nix | 12 +- .../libraries/range-v3/gcc10.patch | 133 ------------------ 2 files changed, 2 insertions(+), 143 deletions(-) delete mode 100644 pkgs/development/libraries/range-v3/gcc10.patch diff --git a/pkgs/development/libraries/range-v3/default.nix b/pkgs/development/libraries/range-v3/default.nix index e29fc1f70c93..77db5869f62a 100644 --- a/pkgs/development/libraries/range-v3/default.nix +++ b/pkgs/development/libraries/range-v3/default.nix @@ -2,23 +2,15 @@ stdenv.mkDerivation rec { pname = "range-v3"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "ericniebler"; repo = "range-v3"; rev = version; - sha256 = "18230bg4rq9pmm5f8f65j444jpq56rld4fhmpham8q3vr1c1bdjh"; + hash = "sha256-bRSX91+ROqG1C3nB9HSQaKgLzOHEFy9mrD2WW3PRBWU="; }; - patches = [ - ./gcc10.patch - (fetchpatch { - url = "https://github.com/ericniebler/range-v3/commit/66e847d4e14be3a369b7e26a03a172b20e62c003.patch"; - sha256 = "sha256-JOQptVqNicdMhcDhBrWQRf7MfskBv56cICwvMA8g88Y="; - }) - ]; - nativeBuildInputs = [ cmake ]; # Building the tests currently fails on AArch64 due to internal compiler diff --git a/pkgs/development/libraries/range-v3/gcc10.patch b/pkgs/development/libraries/range-v3/gcc10.patch deleted file mode 100644 index caebf0a63162..000000000000 --- a/pkgs/development/libraries/range-v3/gcc10.patch +++ /dev/null @@ -1,133 +0,0 @@ -From a91f0e1be27a31c446452a753001d4518ef83a6b Mon Sep 17 00:00:00 2001 -From: Eric Niebler -Date: Mon, 17 Aug 2020 17:48:09 -0700 -Subject: [PATCH] work around premature instantiation problem on gcc; fixes - #1545 - ---- - include/range/v3/view/chunk.hpp | 6 +++--- - include/range/v3/view/split.hpp | 26 +++++++++++++------------- - 2 files changed, 16 insertions(+), 16 deletions(-) - -diff --git a/include/range/v3/view/chunk.hpp b/include/range/v3/view/chunk.hpp -index 0c03cf1eb..b8df13303 100644 ---- a/include/range/v3/view/chunk.hpp -+++ b/include/range/v3/view/chunk.hpp -@@ -313,8 +313,8 @@ namespace ranges - - public: - inner_view() = default; -- constexpr explicit inner_view(chunk_view_ & view) noexcept -- : rng_{&view} -+ constexpr explicit inner_view(chunk_view_ * view) noexcept -+ : rng_{view} - {} - CPP_auto_member - constexpr auto CPP_fun(size)()( -@@ -338,7 +338,7 @@ namespace ranges - constexpr inner_view read() const - { - RANGES_EXPECT(!done()); -- return inner_view{*rng_}; -+ return inner_view{rng_}; - } - constexpr bool done() const - { -diff --git a/include/range/v3/view/split.hpp b/include/range/v3/view/split.hpp -index facf1b37f..496220e4a 100644 ---- a/include/range/v3/view/split.hpp -+++ b/include/range/v3/view/split.hpp -@@ -389,19 +389,19 @@ namespace ranges - split_outer_iterator() = default; - - CPP_member -- constexpr explicit CPP_ctor(split_outer_iterator)(Parent & parent)( -+ constexpr explicit CPP_ctor(split_outer_iterator)(Parent * parent)( - /// \pre - requires (!forward_range)) -- : parent_(&parent) -+ : parent_(parent) - {} - - CPP_member -- constexpr CPP_ctor(split_outer_iterator)(Parent & parent, -+ constexpr CPP_ctor(split_outer_iterator)(Parent * parent, - iterator_t current)( - /// \pre - requires forward_range) - : Current{std::move(current)} -- , parent_(&parent) -+ , parent_(parent) - {} - - template(bool Other)( -@@ -519,7 +519,7 @@ namespace ranges - ranges::equal_to> && - (forward_range || detail::tiny_range) - #endif -- struct RANGES_EMPTY_BASES split_view -+ struct RANGES_EMPTY_BASES split_view - : view_interface, is_finite::value ? finite : unknown> - , private detail::split_view_base> - { -@@ -537,17 +537,17 @@ namespace ranges - #if RANGES_CXX_IF_CONSTEXPR < RANGES_CXX_IF_CONSTEXPR_17 - outer_iterator()> begin_(std::true_type) - { -- return outer_iterator()>{*this, ranges::begin(base_)}; -+ return outer_iterator()>{this, ranges::begin(base_)}; - } - outer_iterator begin_(std::false_type) - { - this->curr_ = ranges::begin(base_); -- return outer_iterator{*this}; -+ return outer_iterator{this}; - } - - outer_iterator()> end_(std::true_type) const - { -- return outer_iterator{*this, ranges::end(base_)}; -+ return outer_iterator{this, ranges::end(base_)}; - } - default_sentinel_t end_(std::false_type) const - { -@@ -580,11 +580,11 @@ namespace ranges - { - #if RANGES_CXX_IF_CONSTEXPR >= RANGES_CXX_IF_CONSTEXPR_17 - if constexpr(forward_range) -- return outer_iterator()>{*this, ranges::begin(base_)}; -+ return outer_iterator()>{this, ranges::begin(base_)}; - else - { - this->curr_ = ranges::begin(base_); -- return outer_iterator{*this}; -+ return outer_iterator{this}; - } - #else - return begin_(meta::bool_>{}); -@@ -596,7 +596,7 @@ namespace ranges - /// \pre - requires forward_range && forward_range) - { -- return {*this, ranges::begin(base_)}; -+ return {this, ranges::begin(base_)}; - } - CPP_member - constexpr auto end() // -@@ -604,14 +604,14 @@ namespace ranges - /// \pre - requires forward_range && common_range) - { -- return outer_iterator()>{*this, ranges::end(base_)}; -+ return outer_iterator()>{this, ranges::end(base_)}; - } - constexpr auto end() const - { - #if RANGES_CXX_IF_CONSTEXPR >= RANGES_CXX_IF_CONSTEXPR_17 - if constexpr(forward_range && forward_range && - common_range) -- return outer_iterator{*this, ranges::end(base_)}; -+ return outer_iterator{this, ranges::end(base_)}; - else - return default_sentinel; - #else From ed3b06d8b5ef6b10a631fffefe7843e9fa88eabe Mon Sep 17 00:00:00 2001 From: Thibault Lemaire Date: Sun, 4 Sep 2022 17:49:07 +0200 Subject: [PATCH 02/52] gzdoom: Fix kdialog not found Co-authored-by: Azat Bahawi --- pkgs/games/gzdoom/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/games/gzdoom/default.nix b/pkgs/games/gzdoom/default.nix index 57825e781cae..c2489e5d033e 100644 --- a/pkgs/games/gzdoom/default.nix +++ b/pkgs/games/gzdoom/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, openal, fluidsynth +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, makeWrapper, openal, fluidsynth , soundfont-fluid, libGL, SDL2, bzip2, zlib, libjpeg, libsndfile, libvpx, mpg123 , game-music-emu, pkg-config, copyDesktopItems, makeDesktopItem }: @@ -52,6 +52,13 @@ let zmusic ]; + patches = [ + (fetchpatch { # TODO: Delete me when upgrading to 4.9 + url = "https://github.com/ZDoom/gzdoom/commit/aae85a1b9169953d8dcc5f138a477d5c7d75addb.patch"; + sha256 = "upuLDgVMaGaFSVaDV9Hj13DR5LUma51xv+Mfsz9m9a0="; + }) + ]; + NIX_CFLAGS_LINK = "-lopenal -lfluidsynth"; desktopItems = [ From ce6656f510cb01db5c77b3f7b956016c63100bf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 4 Sep 2022 13:12:37 -0300 Subject: [PATCH 03/52] xfce.xfce4-pulseaudio-plugin: 0.4.3 -> 0.4.4 --- .../xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix index 5915a43372d9..7591ed1e0e5c 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix @@ -18,8 +18,8 @@ mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-pulseaudio-plugin"; - version = "0.4.3"; - sha256 = "sha256-+E1pyDP140xUbYPZXhdiEjdU0t8Un+IjV7Ek+hAX3OU="; + version = "0.4.4"; + sha256 = "sha256-arnHB9ziQm/vQk6hYHS+MKL5dJeEVxUX+SwjZ3/LcEQ="; nativeBuildInputs = [ automakeAddFlags From 093edcbfcbcc1ed43655d1c5235364a4796b90d1 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Sun, 4 Sep 2022 11:21:08 -0700 Subject: [PATCH 04/52] R: reenable stackprotector on aarch64-darwin The original error that required disabling the stack protector on aarch64-darwin has been fixed in GCC. --- pkgs/applications/science/math/R/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index 0d045c882864..74f27fa534e2 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -95,11 +95,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - # disable stackprotector on aarch64-darwin for now - # https://github.com/NixOS/nixpkgs/issues/158730 - # see https://github.com/NixOS/nixpkgs/issues/127608 for a similar issue - hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "stackprotector" ]; - setupHook = ./setup-hook.sh; meta = with lib; { From e55b330b9d3a5b0b253b81877b6b03e0e179f384 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Tue, 6 Sep 2022 19:37:06 -0300 Subject: [PATCH 05/52] lxqt.lxqt-archiver: add missing dependence libraries Fixes the error while loading shared libraries: - libmenu-cache.so.3: cannot open shared object file: No such file or directory - libexif.so.12: cannot open shared object file: No such file or directory --- pkgs/desktops/lxqt/lxqt-archiver/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/desktops/lxqt/lxqt-archiver/default.nix b/pkgs/desktops/lxqt/lxqt-archiver/default.nix index fc33e5a683ec..d3ddb03b9271 100644 --- a/pkgs/desktops/lxqt/lxqt-archiver/default.nix +++ b/pkgs/desktops/lxqt/lxqt-archiver/default.nix @@ -5,7 +5,9 @@ , pkg-config , lxqt-build-tools , json-glib +, libexif , libfm-qt +, menu-cache , qtbase , qttools , qtx11extras @@ -31,7 +33,9 @@ mkDerivation rec { buildInputs = [ json-glib + libexif libfm-qt + menu-cache qtbase qttools qtx11extras From e9b99943ddf422f939dff594cbdd88b9e3f16fd5 Mon Sep 17 00:00:00 2001 From: kilianar Date: Wed, 7 Sep 2022 09:42:30 +0200 Subject: [PATCH 06/52] nixosTests.gitea.*: adapt to option renaming --- nixos/tests/gitea.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/gitea.nix b/nixos/tests/gitea.nix index 037fc7b31bfa..68a2566c1191 100644 --- a/nixos/tests/gitea.nix +++ b/nixos/tests/gitea.nix @@ -18,7 +18,7 @@ let services.gitea = { enable = true; database = { inherit type; }; - disableRegistration = true; + settings.service.DISABLE_REGISTRATION = true; }; environment.systemPackages = [ pkgs.gitea pkgs.jq ]; services.openssh.enable = true; From 5574eef42c32fa448b5dd5b3ac202c99f24c0ab2 Mon Sep 17 00:00:00 2001 From: firefly-cpp Date: Fri, 9 Sep 2022 10:53:38 +0200 Subject: [PATCH 07/52] python310Packages.toml-adapt: init at 0.2.8 --- .../python-modules/toml-adapt/default.nix | 48 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 50 insertions(+) create mode 100644 pkgs/development/python-modules/toml-adapt/default.nix diff --git a/pkgs/development/python-modules/toml-adapt/default.nix b/pkgs/development/python-modules/toml-adapt/default.nix new file mode 100644 index 000000000000..0ff06f43093f --- /dev/null +++ b/pkgs/development/python-modules/toml-adapt/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, click +, fetchFromGitHub +, poetry-core +, pytestCheckHook +, pythonOlder +, toml +}: + +buildPythonPackage rec { + pname = "toml-adapt"; + version = "0.2.8"; + format = "pyproject"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "firefly-cpp"; + repo = pname; + rev = version; + sha256 = "sha256-9auZZl6c+EfAO/2QaHW5BI1aDZkIIGU+fwzudIdFWqI="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + click + toml + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "toml_adapt" + ]; + + meta = with lib; { + description = "A simple Command-line interface for manipulating toml files"; + homepage = "https://github.com/firefly-cpp/toml-adapt"; + license = licenses.mit; + maintainers = with maintainers; [ firefly-cpp ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5ba002444a9a..80d5ca6f9d4d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10963,6 +10963,8 @@ in { toml = callPackage ../development/python-modules/toml { }; + toml-adapt = callPackage ../development/python-modules/toml-adapt { }; + tomli = callPackage ../development/python-modules/tomli { }; tomli-w = callPackage ../development/python-modules/tomli-w { }; From ec13e46dd1e314b2384cc7de59f884a22ea67788 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Fri, 9 Sep 2022 11:05:58 +0200 Subject: [PATCH 08/52] redmine: support arch-dependent gem dependencies in update.sh Method inspired by the update script for `discourse` in nixpkgs. --- pkgs/applications/version-management/redmine/update.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/redmine/update.sh b/pkgs/applications/version-management/redmine/update.sh index de59f4685d5c..3c4d842735cf 100755 --- a/pkgs/applications/version-management/redmine/update.sh +++ b/pkgs/applications/version-management/redmine/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell --pure -i bash -p cacert bundix +#!nix-shell --pure -i bash -p cacert bundix bundler # Do these steps before running this script: # 1. Copy Gemfile from new Redmine version to this folder @@ -14,4 +14,6 @@ for file in "gemset.nix" "Gemfile.lock"; do fi done +bundle lock --add-platform ruby +bundle lock --remove-platform x86_64-linux bundix -l From 9c642006bd87d8ab6d1c4bd10ee2a45beb7e29ac Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Fri, 9 Sep 2022 11:07:38 +0200 Subject: [PATCH 09/52] redmine: add nixos test to passthru.tests --- pkgs/applications/version-management/redmine/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/redmine/default.nix b/pkgs/applications/version-management/redmine/default.nix index 1f0f9f4e788d..6d842665046a 100644 --- a/pkgs/applications/version-management/redmine/default.nix +++ b/pkgs/applications/version-management/redmine/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, bundlerEnv, ruby, makeWrapper }: +{ lib, stdenv, fetchurl, bundlerEnv, ruby, makeWrapper, nixosTests }: let version = "4.2.5"; @@ -42,6 +42,8 @@ in makeWrapper ${rubyEnv.wrappedRuby}/bin/ruby $out/bin/rdm-mailhandler.rb --add-flags $out/share/redmine/extra/mail_handler/rdm-mailhandler.rb ''; + passthru.tests.redmine = nixosTests.redmine; + meta = with lib; { homepage = "https://www.redmine.org/"; platforms = platforms.linux; From 9800628109ccf6dbefe4323345d038093fd13b48 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Fri, 9 Sep 2022 11:07:47 +0200 Subject: [PATCH 10/52] redmine: 4.2.5 -> 4.2.7 --- .../version-management/redmine/Gemfile | 10 +- .../version-management/redmine/Gemfile.lock | 132 +++++++-------- .../version-management/redmine/default.nix | 4 +- .../version-management/redmine/gemset.nix | 152 ++++++++++-------- 4 files changed, 165 insertions(+), 133 deletions(-) diff --git a/pkgs/applications/version-management/redmine/Gemfile b/pkgs/applications/version-management/redmine/Gemfile index 3b1ac09c8a4c..3b22a9d50743 100644 --- a/pkgs/applications/version-management/redmine/Gemfile +++ b/pkgs/applications/version-management/redmine/Gemfile @@ -3,7 +3,7 @@ source 'https://rubygems.org' ruby '>= 2.4.0', '< 2.8.0' gem 'bundler', '>= 1.12.0' -gem 'rails', '5.2.6.3' +gem 'rails', '5.2.8' gem 'sprockets', '~> 3.7.2' if RUBY_VERSION < '2.5' gem 'globalid', '~> 0.4.2' if Gem.ruby_version < Gem::Version.new('2.6.0') gem 'rouge', '~> 3.26.0' @@ -14,7 +14,13 @@ gem 'roadie-rails', (RUBY_VERSION < '2.5' ? '~> 1.3.0' : '~> 2.2.0') gem 'marcel' gem "mail", "~> 2.7.1" gem 'csv', (RUBY_VERSION < '2.5' ? ['>= 3.1.1', '<= 3.1.5'] : '~> 3.1.1') -gem 'nokogiri', (RUBY_VERSION < '2.5' ? '~> 1.10.0' : '~> 1.11.1') +gem 'nokogiri', (if Gem.ruby_version < Gem::Version.new('2.5.0') + '~> 1.10.10' + elsif Gem.ruby_version < Gem::Version.new('2.6.0') + '~> 1.12.5' + else + '~> 1.13.6' + end) gem 'i18n', '~> 1.8.2' gem "rbpdf", "~> 1.20.0" gem 'addressable' diff --git a/pkgs/applications/version-management/redmine/Gemfile.lock b/pkgs/applications/version-management/redmine/Gemfile.lock index 2643918716af..5ad1b80d3c77 100644 --- a/pkgs/applications/version-management/redmine/Gemfile.lock +++ b/pkgs/applications/version-management/redmine/Gemfile.lock @@ -1,19 +1,19 @@ GEM remote: https://rubygems.org/ specs: - actioncable (5.2.6.3) - actionpack (= 5.2.6.3) + actioncable (5.2.8) + actionpack (= 5.2.8) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailer (5.2.6.3) - actionpack (= 5.2.6.3) - actionview (= 5.2.6.3) - activejob (= 5.2.6.3) + actionmailer (5.2.8) + actionpack (= 5.2.8) + actionview (= 5.2.8) + activejob (= 5.2.8) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.2.6.3) - actionview (= 5.2.6.3) - activesupport (= 5.2.6.3) + actionpack (5.2.8) + actionview (= 5.2.8) + activesupport (= 5.2.8) rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) @@ -21,32 +21,32 @@ GEM actionpack-xml_parser (2.0.1) actionpack (>= 5.0) railties (>= 5.0) - actionview (5.2.6.3) - activesupport (= 5.2.6.3) + actionview (5.2.8) + activesupport (= 5.2.8) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.2.6.3) - activesupport (= 5.2.6.3) + activejob (5.2.8) + activesupport (= 5.2.8) globalid (>= 0.3.6) - activemodel (5.2.6.3) - activesupport (= 5.2.6.3) - activerecord (5.2.6.3) - activemodel (= 5.2.6.3) - activesupport (= 5.2.6.3) + activemodel (5.2.8) + activesupport (= 5.2.8) + activerecord (5.2.8) + activemodel (= 5.2.8) + activesupport (= 5.2.8) arel (>= 9.0) - activestorage (5.2.6.3) - actionpack (= 5.2.6.3) - activerecord (= 5.2.6.3) + activestorage (5.2.8) + actionpack (= 5.2.8) + activerecord (= 5.2.8) marcel (~> 1.0.0) - activesupport (5.2.6.3) + activesupport (5.2.8) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) + addressable (2.8.1) + public_suffix (>= 2.0.2, < 6.0) arel (9.0.0) ast (2.4.2) builder (3.2.4) @@ -66,13 +66,13 @@ GEM addressable csv (3.1.9) docile (1.4.0) - erubi (1.10.0) + erubi (1.11.0) globalid (1.0.0) activesupport (>= 5.0) htmlentities (4.3.4) i18n (1.8.11) concurrent-ruby (~> 1.0) - loofah (2.16.0) + loofah (2.18.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) @@ -81,48 +81,52 @@ GEM method_source (1.0.0) mini_magick (4.11.0) mini_mime (1.0.3) - minitest (5.15.0) - mocha (1.13.0) - mysql2 (0.5.3) - net-ldap (0.17.0) + mini_portile2 (2.8.0) + minitest (5.16.3) + mocha (1.14.0) + mysql2 (0.5.4) + net-ldap (0.17.1) nio4r (2.5.8) - nokogiri (1.11.7) + nokogiri (1.13.8) + mini_portile2 (~> 2.8.0) + racc (~> 1.4) + nokogiri (1.13.8-x86_64-linux) racc (~> 1.4) parallel (1.22.1) - parser (3.1.2.0) + parser (3.1.2.1) ast (~> 2.4.1) pg (1.2.3) - public_suffix (4.0.7) - puma (5.6.4) + public_suffix (5.0.0) + puma (5.6.5) nio4r (~> 2.0) racc (1.6.0) - rack (2.2.3) + rack (2.2.4) rack-openid (1.4.2) rack (>= 1.1.0) ruby-openid (>= 2.1.8) - rack-test (1.1.0) - rack (>= 1.0, < 3) - rails (5.2.6.3) - actioncable (= 5.2.6.3) - actionmailer (= 5.2.6.3) - actionpack (= 5.2.6.3) - actionview (= 5.2.6.3) - activejob (= 5.2.6.3) - activemodel (= 5.2.6.3) - activerecord (= 5.2.6.3) - activestorage (= 5.2.6.3) - activesupport (= 5.2.6.3) + rack-test (2.0.2) + rack (>= 1.3) + rails (5.2.8) + actioncable (= 5.2.8) + actionmailer (= 5.2.8) + actionpack (= 5.2.8) + actionview (= 5.2.8) + activejob (= 5.2.8) + activemodel (= 5.2.8) + activerecord (= 5.2.8) + activestorage (= 5.2.8) + activesupport (= 5.2.8) bundler (>= 1.3.0) - railties (= 5.2.6.3) + railties (= 5.2.8) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.4.2) + rails-html-sanitizer (1.4.3) loofah (~> 2.3) - railties (5.2.6.3) - actionpack (= 5.2.6.3) - activesupport (= 5.2.6.3) + railties (5.2.8) + actionpack (= 5.2.8) + activesupport (= 5.2.8) method_source rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) @@ -145,7 +149,7 @@ GEM roadie (>= 3.1, < 5.0) rotp (6.2.0) rouge (3.26.1) - rqrcode (2.1.1) + rqrcode (2.1.2) chunky_png (~> 1.0) rqrcode_core (~> 1.0) rqrcode_core (1.2.0) @@ -158,7 +162,7 @@ GEM rubocop-ast (>= 1.2.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.17.0) + rubocop-ast (1.21.0) parser (>= 3.1.1.0) rubocop-performance (1.10.2) rubocop (>= 0.90.0, < 2.0) @@ -170,15 +174,16 @@ GEM ruby-openid (2.9.2) ruby-progressbar (1.11.0) rubyzip (2.3.2) - selenium-webdriver (4.1.0) + selenium-webdriver (4.4.0) childprocess (>= 0.5, < 5.0) rexml (~> 3.2, >= 3.2.5) - rubyzip (>= 1.2.2) + rubyzip (>= 1.2.2, < 3.0) + websocket (~> 1.0) simplecov (0.18.5) docile (~> 1.1) simplecov-html (~> 0.11) simplecov-html (0.12.3) - sprockets (4.0.3) + sprockets (4.1.1) concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-rails (3.4.2) @@ -187,20 +192,21 @@ GEM sprockets (>= 3.0.0) thor (1.2.1) thread_safe (0.3.6) - tzinfo (1.2.9) + tzinfo (1.2.10) thread_safe (~> 0.1) - unicode-display_width (2.1.0) + unicode-display_width (2.2.0) webdrivers (4.7.0) nokogiri (~> 1.6) rubyzip (>= 1.3.0) selenium-webdriver (> 3.141, < 5.0) webrick (1.7.0) + websocket (1.2.9) websocket-driver (0.7.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) xpath (3.2.0) nokogiri (~> 1.8) - yard (0.9.27) + yard (0.9.28) webrick (~> 1.7.0) PLATFORMS @@ -221,11 +227,11 @@ DEPENDENCIES mocha (>= 1.4.0) mysql2 (~> 0.5.0) net-ldap (~> 0.17.0) - nokogiri (~> 1.11.1) + nokogiri (~> 1.13.6) pg (~> 1.2.2) puma rack-openid - rails (= 5.2.6.3) + rails (= 5.2.8) rails-dom-testing rbpdf (~> 1.20.0) redcarpet (~> 3.5.1) @@ -249,4 +255,4 @@ RUBY VERSION ruby 2.7.6p219 BUNDLED WITH - 2.2.33 + 2.3.20 diff --git a/pkgs/applications/version-management/redmine/default.nix b/pkgs/applications/version-management/redmine/default.nix index 6d842665046a..a518a9cec2e8 100644 --- a/pkgs/applications/version-management/redmine/default.nix +++ b/pkgs/applications/version-management/redmine/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, bundlerEnv, ruby, makeWrapper, nixosTests }: let - version = "4.2.5"; + version = "4.2.7"; rubyEnv = bundlerEnv { name = "redmine-env-${version}"; @@ -16,7 +16,7 @@ in src = fetchurl { url = "https://www.redmine.org/releases/${pname}-${version}.tar.gz"; - sha256 = "112rc2sjx6x7046fjz7np0ilszvkqapc180ld02ncwmdxaq88w6r"; + sha256 = "sha256-7UvgO1q2PCZBqH24l4c53Zl8D2Rr+hAQrJ5SEMNDck4="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/version-management/redmine/gemset.nix b/pkgs/applications/version-management/redmine/gemset.nix index 77d1d997fd8b..a478796ca226 100644 --- a/pkgs/applications/version-management/redmine/gemset.nix +++ b/pkgs/applications/version-management/redmine/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gmwailk92znzrdpi4116ih6bq609a38rpnszzh5piq7b507ikpn"; + sha256 = "123nrlrh5kikl314l4gjbc8ljw3h2ppzhpmm7cilisqvn71s5ysd"; type = "gem"; }; - version = "5.2.6.3"; + version = "5.2.8"; }; actionmailer = { dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "103a1nixkazzdk21bg42vs722m6gm0vf17ag2fdad5dycwk3ycpp"; + sha256 = "18vrdwdwfmrnpj8k30qhvdx23km233ffnhhzpbmx8m6spavwvli2"; type = "gem"; }; - version = "5.2.6.3"; + version = "5.2.8"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; @@ -27,10 +27,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15fz3rjk85svpx9lsqfdwlvyd972zf0g5jasnsllcbf6d300gdj6"; + sha256 = "1knnka6n292f4hhbjfchpa4sbjj79wys5y8bcggm8ah894051kzk"; type = "gem"; }; - version = "5.2.6.3"; + version = "5.2.8"; }; actionpack-xml_parser = { dependencies = ["actionpack" "railties"]; @@ -49,10 +49,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00cfpmbk8gw9c589xnqazsbd860p2368gyh8nyzixcsa6k28wfwv"; + sha256 = "0zndg7ax4bckayjw558p9hz92ic6x3r5acfbd5vnad0xh7hfdrmx"; type = "gem"; }; - version = "5.2.6.3"; + version = "5.2.8"; }; activejob = { dependencies = ["activesupport" "globalid"]; @@ -60,10 +60,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gczbnk7qy4rjhv0q82nd70xawc9lb1vinvwr4ngpim5rqwzm6d6"; + sha256 = "0kzb5y4lflmvi3vxz2zrj55k6xyys2h5bdqp2ki69rcyd4ay5qrg"; type = "gem"; }; - version = "5.2.6.3"; + version = "5.2.8"; }; activemodel = { dependencies = ["activesupport"]; @@ -71,10 +71,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ib8qlbwr9hp5284c6bmx08lrfy45zzd4inzmawz08alkgdcrzca"; + sha256 = "1b6pskl8x4c1hcsf4xh4cl9qlh814s91bjv3yy94cdc4xpl76vr6"; type = "gem"; }; - version = "5.2.6.3"; + version = "5.2.8"; }; activerecord = { dependencies = ["activemodel" "activesupport" "arel"]; @@ -82,10 +82,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ky3zc8i5rjg2dpdb95icsgb443siim9sv71xwcmryjxp5rhkqyx"; + sha256 = "078iiv5g02n1ivrgpkbw5bxkbihi85msvn88p5q37vbfr14ynk0a"; type = "gem"; }; - version = "5.2.6.3"; + version = "5.2.8"; }; activestorage = { dependencies = ["actionpack" "activerecord" "marcel"]; @@ -93,10 +93,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1risg5jklxrm7j5i4rzaqpb94822ivbjaasblppwmx5f33vhfpca"; + sha256 = "1xnxgg9j4nr6yw8g3l0jdr9m985k3wrvjql9j5qr5lfcsn9zwz4w"; type = "gem"; }; - version = "5.2.6.3"; + version = "5.2.8"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; @@ -104,10 +104,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09vif5aajkvrsdcl51kvk8crz8hl38awprh7d5wj93nscpxmqgns"; + sha256 = "0anvhpxjgic1cv1h66lmz6x5nd7g0bbnwl0rgxnbdr3w76fa8w02"; type = "gem"; }; - version = "5.2.6.3"; + version = "5.2.8"; }; addressable = { dependencies = ["public_suffix"]; @@ -115,10 +115,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "022r3m9wdxljpbya69y2i3h9g3dhhfaqzidf95m6qjzms792jvgp"; + sha256 = "1ypdmpdn20hxp5vwxz3zc04r5xcwqc25qszdlg41h8ghdqbllwmw"; type = "gem"; }; - version = "2.8.0"; + version = "2.8.1"; }; arel = { groups = ["default"]; @@ -237,10 +237,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09l8lz3j00m898li0yfsnb6ihc63rdvhw3k5xczna5zrjk104f2l"; + sha256 = "11bz1v1cxabm8672gabrw542zyg51dizlcvdck6vvwzagxbjv9zx"; type = "gem"; }; - version = "1.10.0"; + version = "1.11.0"; }; globalid = { dependencies = ["activesupport"]; @@ -280,10 +280,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15s6z5bvhdhnqv4wg8zcz3mhbc7i4dbqskv5jvhprz33ak7682km"; + sha256 = "18ymp6l3bv7abz07k6qbbi9c9vsiahq30d2smh4qzsvag8j5m5v1"; type = "gem"; }; - version = "2.16.0"; + version = "2.18.0"; }; mail = { dependencies = ["mini_mime"]; @@ -336,25 +336,35 @@ }; version = "1.0.3"; }; + mini_portile2 = { + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rapl1sfmfi3bfr68da4ca16yhc0pp93vjwkj7y3rdqrzy3b41hy"; + type = "gem"; + }; + version = "2.8.0"; + }; minitest = { groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06xf558gid4w8lwx13jwfdafsch9maz8m0g85wnfymqj63x5nbbd"; + sha256 = "0516ypqlx0mlcfn5xh7qppxqc3xndn1fnadxawa8wld5dkcimy30"; type = "gem"; }; - version = "5.15.0"; + version = "5.16.3"; }; mocha = { groups = ["test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15s53ggsykk69kxqvs4416s8yxdhz6caggva55n8sjgy4ixzwp10"; + sha256 = "0ffd7zn24lwhp3xp747jfg4zxgqbm04ar7shhjy2iv5xg1pz01lr"; type = "gem"; }; - version = "1.13.0"; + version = "1.14.0"; }; mysql2 = { groups = ["default"]; @@ -369,20 +379,20 @@ }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0d14pcy5m4hjig0zdxnl9in5f4izszc7v9zcczf2gyi5kiyxk8jw"; + sha256 = "0xsy70mg4p854jska7ff7cy8fyn9nhlkrmfdvkkfmk8qxairbfq1"; type = "gem"; }; - version = "0.5.3"; + version = "0.5.4"; }; net-ldap = { groups = ["ldap"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1j19yxrz7h3hj7kiiln13c7bz7hvpdqr31bwi88dj64zifr7896n"; + sha256 = "1ycw0qsw3hap8svakl0i30jkj0ffd4lpyrn17a1j0w8mz5ainmsj"; type = "gem"; }; - version = "0.17.0"; + version = "0.17.1"; }; nio4r = { groups = ["default" "test"]; @@ -395,15 +405,15 @@ version = "2.5.8"; }; nokogiri = { - dependencies = ["racc"]; + dependencies = ["mini_portile2" "racc"]; groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vrn31385ix5k9b0yalnlzv360isv6dincbcvi8psllnwz4sjxj9"; + sha256 = "0g7axlq2y6gzmixzzzhw3fn6nhrhg469jj8gfr7gs8igiclpkhkr"; type = "gem"; }; - version = "1.11.7"; + version = "1.13.8"; }; parallel = { groups = ["default" "test"]; @@ -421,10 +431,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xhfghgidj8cbdnqp01f7kvnrv1f60izpkd9dhxsvpdzkfsdg97d"; + sha256 = "1q31n7yj59wka8xl8s5wkf66hm4pgvblx95czyxffprdnlhrir2p"; type = "gem"; }; - version = "3.1.2.0"; + version = "3.1.2.1"; }; pg = { groups = ["default"]; @@ -449,10 +459,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1f3knlwfwm05sfbaihrxm4g772b79032q14c16q4b38z8bi63qcb"; + sha256 = "0sqw1zls6227bgq38sxb2hs8nkdz4hn1zivs27mjbniswfy4zvi6"; type = "gem"; }; - version = "4.0.7"; + version = "5.0.0"; }; puma = { dependencies = ["nio4r"]; @@ -460,10 +470,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dgr2rybayih2naz3658mbzqwfrg9fxl80zsvhscf6b972kp3jdw"; + sha256 = "0qzq0c791kacv68hgk9zqsd1p7zx1y1rr9j10rn9yphibb8jj436"; type = "gem"; }; - version = "5.6.4"; + version = "5.6.5"; }; racc = { groups = ["default" "test"]; @@ -480,10 +490,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0i5vs0dph9i5jn8dfc6aqd6njcafmb20rwqngrf759c9cvmyff16"; + sha256 = "0axc6w0rs4yj0pksfll1hjgw1k6a5q0xi2lckh91knfb72v348pa"; type = "gem"; }; - version = "2.2.3"; + version = "2.2.4"; }; rack-openid = { dependencies = ["rack" "ruby-openid"]; @@ -502,10 +512,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rh8h376mx71ci5yklnpqqn118z3bl67nnv5k801qaqn1zs62h8m"; + sha256 = "0rjl709krgf499dhjdapg580l2qaj9d91pwzk8ck8fpnazlx1bdd"; type = "gem"; }; - version = "1.1.0"; + version = "2.0.2"; }; rails = { dependencies = ["actioncable" "actionmailer" "actionpack" "actionview" "activejob" "activemodel" "activerecord" "activestorage" "activesupport" "railties" "sprockets-rails"]; @@ -513,10 +523,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19962nkjssr77753a8893yz17kmvb63h9rl3ajq6r8rx9xifq8fn"; + sha256 = "0884z2ilm4by47qk7my856dr42vzy12ghj241rymp13flaf54449"; type = "gem"; }; - version = "5.2.6.3"; + version = "5.2.8"; }; rails-dom-testing = { dependencies = ["activesupport" "nokogiri"]; @@ -535,10 +545,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09qrfi3pgllxb08r024lln9k0qzxs57v0slsj8616xf9c0cwnwbk"; + sha256 = "1mj0b7ay10a2fgwj70kjw7mlyrp7a5la8lx8zmwhy40bkansdfrf"; type = "gem"; }; - version = "1.4.2"; + version = "1.4.3"; }; railties = { dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor"]; @@ -546,10 +556,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0waa50li6vvckz9mznyz4jhks46ba09fmbdadrrj35mzwahyb6fy"; + sha256 = "157mmm2jhvq2g08xhq0780i3r4i679h14m68jj7265ik26gbchhc"; type = "gem"; }; - version = "5.2.6.3"; + version = "5.2.8"; }; rainbow = { groups = ["default" "test"]; @@ -681,10 +691,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10sq4aknch9rzpy8af77rqxk8rr59d33slg1kwg9h7fw9f1spmjn"; + sha256 = "0s97q1rqmw7rzsdr500hr4f2k6s24n8qk1klciz5q94zvdrygx3p"; type = "gem"; }; - version = "2.1.1"; + version = "2.1.2"; }; rqrcode_core = { groups = ["default"]; @@ -713,10 +723,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1k9izkr5rhw3zc309yjp17z7496l74j4li3zrcgpgqfnqwz695qx"; + sha256 = "0s4m9h9hzrpfmsnswvfimafmjwfa79cbqh9dvq18cja32dhrhpcg"; type = "gem"; }; - version = "1.17.0"; + version = "1.21.0"; }; rubocop-performance = { dependencies = ["rubocop" "rubocop-ast"]; @@ -771,15 +781,15 @@ version = "2.3.2"; }; selenium-webdriver = { - dependencies = ["childprocess" "rexml" "rubyzip"]; + dependencies = ["childprocess" "rexml" "rubyzip" "websocket"]; groups = ["test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17hilxa40cj7q48k6wcx1cbdb1v3q9c4nx89fji7gyqpcfm16vq7"; + sha256 = "1vy0baak61wr652a7qf249n85sqq5k5mi51ws5ccyyirlsymz2gv"; type = "gem"; }; - version = "4.1.0"; + version = "4.4.0"; }; simplecov = { dependencies = ["docile" "simplecov-html"]; @@ -808,10 +818,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19k5cwg8gyb6lkmz4kab7c5nlplpgj64jy7vw8p5l2i2ysq5hym0"; + sha256 = "1qj82dcfkk6c4zw357k5r05s5iwvyddh57bpwj0a1hjgaw70pcb8"; type = "gem"; }; - version = "4.0.3"; + version = "4.1.1"; }; sprockets-rails = { dependencies = ["actionpack" "activesupport" "sprockets"]; @@ -850,20 +860,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zwqqh6138s8b321fwvfbywxy00lw1azw4ql3zr0xh1aqxf8cnvj"; + sha256 = "0rw89y3zj0wcybcyiazgcprg6hi42k8ipp1n2lbl95z1dmpgmly6"; type = "gem"; }; - version = "1.2.9"; + version = "1.2.10"; }; unicode-display_width = { groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0csjm9shhfik0ci9mgimb7hf3xgh7nx45rkd9rzgdz6vkwr8rzxn"; + sha256 = "1nlfck6z986fngp0r74maswmyb1rcksc8xc3mfpw9cj23c3s8zwn"; type = "gem"; }; - version = "2.1.0"; + version = "2.2.0"; }; webdrivers = { dependencies = ["nokogiri" "rubyzip" "selenium-webdriver"]; @@ -886,6 +896,16 @@ }; version = "1.7.0"; }; + websocket = { + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dib6p55sl606qb4vpwrvj5wh881kk4aqn2zpfapf8ckx7g14jw8"; + type = "gem"; + }; + version = "1.2.9"; + }; websocket-driver = { dependencies = ["websocket-extensions"]; groups = ["default"]; @@ -924,9 +944,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0d08gkis1imlvppyh8dbslk89hwj5af2fmlzvmwahgx2bm48d9sn"; + sha256 = "0p1if8g9ww6hlpfkphqv3y1z0rbqnnrvb38c5qhnala0f8qpw6yk"; type = "gem"; }; - version = "0.9.27"; + version = "0.9.28"; }; } From 8a202d784f85f2080e4282d787838872e5147a50 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Fri, 9 Sep 2022 12:25:53 +0200 Subject: [PATCH 11/52] cryptomator: 1.6.13 -> 1.6.14 --- pkgs/tools/security/cryptomator/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/cryptomator/default.nix b/pkgs/tools/security/cryptomator/default.nix index 19387045e736..1e6833f3a8b3 100644 --- a/pkgs/tools/security/cryptomator/default.nix +++ b/pkgs/tools/security/cryptomator/default.nix @@ -6,13 +6,13 @@ let pname = "cryptomator"; - version = "1.6.13"; + version = "1.6.14"; src = fetchFromGitHub { owner = "cryptomator"; repo = "cryptomator"; rev = version; - sha256 = "sha256-xQxCSWbovdecTFWFDFu2K+lbA6+bSV2l2kk+R/hFcQ0="; + sha256 = "sha256-ArOYL3xj2HiXXu1Bymd5mciMsmikCDvxr5M3LMqZgYA="; }; # perform fake build to make a fixed-output derivation out of the files downloaded from maven central (120MB) @@ -37,7 +37,7 @@ let outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "sha256-SFiYHUH1Et7/SgciIvLcQGh54Z3fDVp22jSvDavXPjE="; + outputHash = "sha256-svpz1mHCHNQGWc+CBroAPvW4cXQdYuqFkK4JSmf6kXE="; doCheck = false; }; From 4391d76b8f187f52ce6a7ab317271058251e0132 Mon Sep 17 00:00:00 2001 From: Sandro Date: Fri, 9 Sep 2022 14:15:34 +0200 Subject: [PATCH 12/52] sway-launcher-desktop: remove default mainProgram --- pkgs/applications/misc/sway-launcher-desktop/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/misc/sway-launcher-desktop/default.nix b/pkgs/applications/misc/sway-launcher-desktop/default.nix index b67122965234..174b95df67bb 100644 --- a/pkgs/applications/misc/sway-launcher-desktop/default.nix +++ b/pkgs/applications/misc/sway-launcher-desktop/default.nix @@ -37,6 +37,5 @@ stdenv.mkDerivation rec { license = licenses.gpl3; platforms = platforms.linux; maintainers = [ maintainers.thehedgeh0g ]; - mainProgram = "${pname}"; }; } From 480c8ee25c9eaa11f368d147620a6c2783e104c3 Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Thu, 8 Sep 2022 10:43:44 +0530 Subject: [PATCH 13/52] sagittarius-scheme: 0.9.8 -> 0.9.9 --- pkgs/development/compilers/sagittarius-scheme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/sagittarius-scheme/default.nix b/pkgs/development/compilers/sagittarius-scheme/default.nix index 5cac2a8457d9..7f48108314b6 100644 --- a/pkgs/development/compilers/sagittarius-scheme/default.nix +++ b/pkgs/development/compilers/sagittarius-scheme/default.nix @@ -16,10 +16,10 @@ let platformLdLibraryPath = if stdenv.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH" in stdenv.mkDerivation rec { pname = "sagittarius-scheme"; - version = "0.9.8"; + version = "0.9.9"; src = fetchurl { url = "https://bitbucket.org/ktakashi/${pname}/downloads/sagittarius-${version}.tar.gz"; - sha256 = "sha256-CdnBpTq+c04JdipfhIiI8EkVFsCc00Gh+cA5zYENMqI="; + sha256 = "sha256-UB7Lfyc2afTIVW5SIiHxXi2wyoVC2Q2ClTkSOQ6UmPg="; }; preBuild = '' # since we lack rpath during build, need to explicitly add build path From 368d037a9ab7ea3c4ccd6bd1e73853948dfd3222 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 Sep 2022 13:01:22 +0000 Subject: [PATCH 14/52] coredns: 1.9.3 -> 1.9.4 --- pkgs/servers/dns/coredns/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/dns/coredns/default.nix b/pkgs/servers/dns/coredns/default.nix index 54965fd998aa..208c59a3ccbe 100644 --- a/pkgs/servers/dns/coredns/default.nix +++ b/pkgs/servers/dns/coredns/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "coredns"; - version = "1.9.3"; + version = "1.9.4"; src = fetchFromGitHub { owner = "coredns"; repo = "coredns"; rev = "v${version}"; - sha256 = "sha256-9lRZjY85SD1HXAWVCp8fpzV0d1Y+LbodT3Sp21CNp+k="; + sha256 = "sha256-9+DwOSfhX+sNnvLMgHKUQSozXzT9k8u7Q1p8FvbvsTE="; }; - vendorSha256 = "sha256-gNa+dm7n71IiSCztTO5VZ5FnGTGYfNXo/HMichNzek0="; + vendorSha256 = "sha256-L4GzOY7oZlC3Et/kEBXrrQGt5/c3jHZimY7NnjXYSro="; postPatch = '' substituteInPlace test/file_cname_proxy_test.go \ From a262d8905b11f17c1da62b5fb69092bba1fe80c6 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Fri, 9 Sep 2022 12:03:14 -0300 Subject: [PATCH 15/52] pixinsight: disable hydra builds --- pkgs/applications/graphics/pixinsight/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/graphics/pixinsight/default.nix b/pkgs/applications/graphics/pixinsight/default.nix index f54aef75ac15..b6e03baace81 100644 --- a/pkgs/applications/graphics/pixinsight/default.nix +++ b/pkgs/applications/graphics/pixinsight/default.nix @@ -128,6 +128,7 @@ stdenv.mkDerivation rec { license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = [ maintainers.sheepforce ]; + hydraPlatforms = []; mainProgram = "PixInsight"; }; } From 656ff1a3507b8906ff23dd3437b4151db8c935a3 Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Fri, 9 Sep 2022 17:26:27 +0200 Subject: [PATCH 16/52] python3Packages.apsw: 3.38.5-r1 -> 3.39.2.1 fix failing test with upstream patch Signed-off-by: Florian Brandes --- pkgs/development/python-modules/apsw/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/apsw/default.nix b/pkgs/development/python-modules/apsw/default.nix index e4b4a94bf832..8e8cab580ea8 100644 --- a/pkgs/development/python-modules/apsw/default.nix +++ b/pkgs/development/python-modules/apsw/default.nix @@ -5,11 +5,12 @@ , sqlite , isPyPy , python +, fetchpatch }: buildPythonPackage rec { pname = "apsw"; - version = "3.38.5-r1"; + version = "3.39.2.1"; format = "setuptools"; disabled = isPyPy; @@ -18,13 +19,22 @@ buildPythonPackage rec { owner = "rogerbinns"; repo = "apsw"; rev = "refs/tags/${version}"; - hash = "sha256-pPviSrONGgWZUREMENPt34bpHggR00Kl6DrB40JWm+w="; + hash = "sha256-W1uQFya/IQUBAPAjwdCJ1K5LVc4spcYj0dN2YP2vtN0="; }; buildInputs = [ sqlite ]; + patches = [ + # ongoing issue: https://github.com/rogerbinns/apsw/issues/363 + # apsw needs to know the compile flags of sqlite to match features + (fetchpatch { + url = "https://github.com/rogerbinns/apsw/commit/e92f019ff785d8e52d381dc541d3f4f8236fb356.patch"; + hash = "sha256-Zdy0ukfWkak9lTdU5WMNzWNp7uDROJgXLcfvQdfm2Oo="; + }) + ]; + # Project uses custom test setup to exclude some tests by default, so using pytest # requires more maintenance # https://github.com/rogerbinns/apsw/issues/335 From 533d36bf24cd1d109107da11b98f655411b9d22c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anselm=20Sch=C3=BCler?= Date: Fri, 9 Sep 2022 20:11:16 +0200 Subject: [PATCH 17/52] fractal-next: unstable-2022-07-21 -> unstable-2022-09-09 --- .../networking/instant-messengers/fractal-next/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/fractal-next/default.nix b/pkgs/applications/networking/instant-messengers/fractal-next/default.nix index e273127559b8..f1b8b0a9e9c7 100644 --- a/pkgs/applications/networking/instant-messengers/fractal-next/default.nix +++ b/pkgs/applications/networking/instant-messengers/fractal-next/default.nix @@ -23,14 +23,14 @@ stdenv.mkDerivation rec { pname = "fractal-next"; - version = "unstable-2022-07-21"; + version = "unstable-2022-09-09"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = "fractal"; - rev = "d076bd24419ac6172c2c1a7cc023a5dca938ef07"; - hash = "sha256-2bS6PZuMbR/VgSpMD31sQR4ZkhWNu1CLSl6MX0f/m5A="; + rev = "5f0a4b48a745ccce202d14e7d02e14f51598fb42"; + hash = "sha256-7s2ytHpM5pZ0dhnVMA8KDWIBaSWds7t9GB6Wav+0dQA="; }; cargoDeps = rustPlatform.fetchCargoTarball { From d57860653cc7c4f288213ae38a0a0e5992129762 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 Sep 2022 16:08:38 +0000 Subject: [PATCH 18/52] python310Packages.pyoverkiz: 1.5.0 -> 1.5.1 --- pkgs/development/python-modules/pyoverkiz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyoverkiz/default.nix b/pkgs/development/python-modules/pyoverkiz/default.nix index 6c7d10b42040..5ff1898c98c7 100644 --- a/pkgs/development/python-modules/pyoverkiz/default.nix +++ b/pkgs/development/python-modules/pyoverkiz/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pyoverkiz"; - version = "1.5.0"; + version = "1.5.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "iMicknl"; repo = "python-overkiz-api"; rev = "refs/tags/v${version}"; - hash = "sha256-xshqcAXj6lGpnTIHhx1A2c+Vso1q8kAwZW7v6XIilj0="; + hash = "sha256-3vtyVXWfAIUZuV0kcnT6UniMaHTw11Az7vHdjyouPbI="; }; nativeBuildInputs = [ From 88d4689ab9c2401d98d64682da7deaf106f41917 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 Sep 2022 16:02:30 +0000 Subject: [PATCH 19/52] python310Packages.pyosmium: 3.3.0 -> 3.4.1 --- pkgs/development/python-modules/pyosmium/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyosmium/default.nix b/pkgs/development/python-modules/pyosmium/default.nix index 3401e905a1a0..3d681c75daa8 100644 --- a/pkgs/development/python-modules/pyosmium/default.nix +++ b/pkgs/development/python-modules/pyosmium/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { pname = "pyosmium"; - version = "3.3.0"; + version = "3.4.1"; disabled = pythonOlder "3.4" || isPyPy; @@ -13,7 +13,7 @@ buildPythonPackage rec { owner = "osmcode"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-vXxRXr+hRrA9oPf8wAS4qQT258Vz+KRSqYwwD6HrDxk="; + sha256 = "sha256-PMQnQe699ZWRR2gevrSCTokyc9xr1TL9Ohuqn7NL8c8="; }; nativeBuildInputs = [ cmake ]; From a69325b0179f092358b2a8659e3cca6126e33a86 Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Fri, 9 Sep 2022 20:52:50 +0200 Subject: [PATCH 20/52] python3Packages.classify-imports: 4.1.0 -> 4.2.0 Signed-off-by: Florian Brandes --- pkgs/development/python-modules/classify-imports/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/classify-imports/default.nix b/pkgs/development/python-modules/classify-imports/default.nix index 3e0245ab58d1..16a7f361be71 100644 --- a/pkgs/development/python-modules/classify-imports/default.nix +++ b/pkgs/development/python-modules/classify-imports/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "classify-imports"; - version = "4.1.0"; + version = "4.2.0"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "asottile"; repo = pname; rev = "v${version}"; - hash = "sha256-w/+Sf2ZVSDmFNPICJfAKzfukcznWyFBhi7hjIELtYGI="; + hash = "sha256-f5wZfisKz9WGdq6u0rd/zg2CfMwWvQeR8xZQNbD7KfU="; }; pythonImportsCheck = [ From 787baf24596a1538e453c94d1eee90aaf6536021 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Fri, 9 Sep 2022 15:56:09 -0300 Subject: [PATCH 21/52] linux: 4.14.291 -> 4.14.292 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index cbcb2d04def4..71eaa0b5c23e 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.14.291"; + version = "4.14.292"; # 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,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "15h76l81zn733g8dc6gsymf52nz325plhminv3m4x3klwhav34zc"; + sha256 = "0zc97qy62dhc5xkjnvsfn4lpl4dgrj23hlxvxcr4cr8sj0hxzx3h"; }; } // (args.argsOverride or {})) From 802f5b47714b593903cf639b37b7e80b4748052e Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Fri, 9 Sep 2022 15:56:19 -0300 Subject: [PATCH 22/52] linux: 4.19.256 -> 4.19.257 --- pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index d1923b847e76..8dac0b120a9c 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.19.256"; + version = "4.19.257"; # 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,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0jgm7ydha9achbcq3a6q85wq1nz4qg7phx122jzk0mqb1339bpk7"; + sha256 = "0izaldl2l2zsshkd07qsnr9x6ikipmj5jp7lxr8dyz7kf2m17pga"; }; } // (args.argsOverride or {})) From 52851d8857558f1b9e3fe8f5b59a31503aedf905 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Fri, 9 Sep 2022 15:56:29 -0300 Subject: [PATCH 23/52] linux: 4.9.326 -> 4.9.327 --- 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 4fc1ce1f1e59..c435a82c50dd 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,12 +1,12 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.9.326"; + version = "4.9.327"; extraMeta.branch = "4.9"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0yw83a8nk5abjsvqrz8m2sj699c228j2f2wr5q8m95vgqzfw5wrb"; + sha256 = "1lh63viynf9f7vl0a52mnal8jack9lbqfsfammwkxi3kafpw30r2"; }; } // (args.argsOverride or {})) From 2919da7f54fedb19edfcb7105fe92cc802a29a72 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Fri, 9 Sep 2022 15:56:36 -0300 Subject: [PATCH 24/52] linux: 5.10.140 -> 5.10.142 --- pkgs/os-specific/linux/kernel/linux-5.10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index 3a08b4a0a457..f17beabecd62 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.140"; + version = "5.10.142"; # 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,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "00v8mdbc8ndx29grfnlf49ifikqxnl25zn0243j3bgclvfyxipx4"; + sha256 = "0s52vfvw5pgnq7gq9n66ib05ryhkxwv765f16862l5gykbdynirz"; }; } // (args.argsOverride or {})) From cece1283c9d7e53c887fa41d00e1193786d78316 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Fri, 9 Sep 2022 15:56:48 -0300 Subject: [PATCH 25/52] linux: 5.15.64 -> 5.15.67 --- pkgs/os-specific/linux/kernel/linux-5.15.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.15.nix b/pkgs/os-specific/linux/kernel/linux-5.15.nix index 8e0edd8273e0..9b98bb0e4cd0 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.15.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.15.64"; + version = "5.15.67"; # 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,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0l6ylmxhk3lqz2zyqcbyhbfcq1p8i84g0p1d6x0q6yd3dy6d78f6"; + sha256 = "0h7r2k59jsw8ykb2p7nxrpazbwx1n5p3nmfbbj1lhib91fldjiys"; }; } // (args.argsOverride or { })) From 2f0101f3804bf781988b89ff7cfff1475c596cd1 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Fri, 9 Sep 2022 15:56:56 -0300 Subject: [PATCH 26/52] linux: 5.19.6 -> 5.19.8 --- pkgs/os-specific/linux/kernel/linux-5.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.19.nix b/pkgs/os-specific/linux/kernel/linux-5.19.nix index 42fd32716dac..a6fb0aa1f583 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.19.6"; + version = "5.19.8"; # 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,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0fm6xysg5mjfig0jils700ph83mvvkl27ix757260i31mwjgi921"; + sha256 = "1kl7fifsa6vsm34xg3kd2svhx18n771hfj67nhwnlalmb9whhqv1"; }; } // (args.argsOverride or { })) From a38d85356915d63babfc2feefeda1cdcb2e00511 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Fri, 9 Sep 2022 15:57:02 -0300 Subject: [PATCH 27/52] linux: 5.4.211 -> 5.4.212 --- pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index f08433e50b47..f341bc77d438 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.211"; + version = "5.4.212"; # 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,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1v1dgsk66fi6x6v9k6hg9ik3f3b3pv7a3gk8mybmgm9cnx0k5d5z"; + sha256 = "1hngr4hsrcd6hmlyvc3msy5racniav2jagp5abmp7xsxv0yjxiq9"; }; } // (args.argsOverride or {})) From c000edba79ddc4c60410ffbfc48c4121bd3bae31 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Fri, 9 Sep 2022 15:57:15 -0300 Subject: [PATCH 28/52] linux-rt_5_10: 5.10.131-rt72 -> 5.10.140-rt73 --- pkgs/os-specific/linux/kernel/linux-rt-5.10.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix index 58be2be6e9d2..8b66df9d82e6 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.10.131-rt72"; # updated by ./update-rt.sh + version = "5.10.140-rt73"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -18,14 +18,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "1ki11mvl3dky7iih90znr47vr66dxnlwrqwg2jkk1hqn5i243i4b"; + sha256 = "00v8mdbc8ndx29grfnlf49ifikqxnl25zn0243j3bgclvfyxipx4"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "0ag000h9m7phvgrqa4jcmd94x0rk8z8bh7qhqqlywbiz2b1b91qa"; + sha256 = "1abrxwxx3kfmbyabb1hhjpz1l7idrn2g14zx7qix7ds7n9f6dcgf"; }; }; in [ rt-patch ] ++ kernelPatches; From afcc2dafdf7284c49081651780509a034b2498a0 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Fri, 9 Sep 2022 15:57:52 -0300 Subject: [PATCH 29/52] linux_latest-libre: 18885 -> 18904 --- 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 437366d1f6ec..6de38abd07f7 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 = "18885"; - sha256 = "1ywd4bhjh6pqxvv20jgadmyvrcrdwf8333z8rzbjy6r0b4fggpra"; + rev = "18904"; + sha256 = "1l200abijg5y15h4vza86sirlcplm7iyhm3igdyxqj3s0169nck9"; } , ... }: From ec9ecabc95351417a11e6265a734fc5403fa99c2 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Fri, 9 Sep 2022 15:58:24 -0300 Subject: [PATCH 30/52] linux/hardened/patches/4.14: 4.14.291-hardened1 -> 4.14.292-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 82fea2f9b5d6..a2c75859fbfe 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -2,12 +2,12 @@ "4.14": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.14.291-hardened1.patch", - "sha256": "04fkfk5kdbqavdg5syyv35xbc8dl5pz8vf1xsvfcv30z5rslsr2c", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.291-hardened1/linux-hardened-4.14.291-hardened1.patch" + "name": "linux-hardened-4.14.292-hardened1.patch", + "sha256": "0l20yxg50azpxm2x4gr37yhkvjw3wlishjm2x8pqwil3g1pxykdi", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.292-hardened1/linux-hardened-4.14.292-hardened1.patch" }, - "sha256": "15h76l81zn733g8dc6gsymf52nz325plhminv3m4x3klwhav34zc", - "version": "4.14.291" + "sha256": "0zc97qy62dhc5xkjnvsfn4lpl4dgrj23hlxvxcr4cr8sj0hxzx3h", + "version": "4.14.292" }, "4.19": { "patch": { From a43178b65801185244a1ee60f626f2aaaeef57fc Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Fri, 9 Sep 2022 15:58:32 -0300 Subject: [PATCH 31/52] linux/hardened/patches/4.19: 4.19.256-hardened1 -> 4.19.257-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index a2c75859fbfe..4f6ecf021f90 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -12,12 +12,12 @@ "4.19": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.19.256-hardened1.patch", - "sha256": "1vqdv2xnfr4ccnfvdrdhj7i0yjhjf48kgc9sziz7fwnfdis8zrrf", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.256-hardened1/linux-hardened-4.19.256-hardened1.patch" + "name": "linux-hardened-4.19.257-hardened1.patch", + "sha256": "03hv417v0abn6n0zbmypfsjmxb4aqdz23vrykhgn259w4h45w2z9", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.257-hardened1/linux-hardened-4.19.257-hardened1.patch" }, - "sha256": "0jgm7ydha9achbcq3a6q85wq1nz4qg7phx122jzk0mqb1339bpk7", - "version": "4.19.256" + "sha256": "0izaldl2l2zsshkd07qsnr9x6ikipmj5jp7lxr8dyz7kf2m17pga", + "version": "4.19.257" }, "5.10": { "patch": { From d1f6bac7c0724dbcb4276689baa464269ad80fa2 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Fri, 9 Sep 2022 15:58:40 -0300 Subject: [PATCH 32/52] linux/hardened/patches/5.10: 5.10.140-hardened1 -> 5.10.142-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 4f6ecf021f90..60ae8240c89a 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -22,12 +22,12 @@ "5.10": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.10.140-hardened1.patch", - "sha256": "0352nh6r9p3djk07lprjpmd8q17kkqb5pi2zwrywlxrzws4wqhzh", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.140-hardened1/linux-hardened-5.10.140-hardened1.patch" + "name": "linux-hardened-5.10.142-hardened1.patch", + "sha256": "074w7j8wx2k3lk3ssm9x14wf4gns85l2p6syq4pigkb67gvdphpv", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.142-hardened1/linux-hardened-5.10.142-hardened1.patch" }, - "sha256": "00v8mdbc8ndx29grfnlf49ifikqxnl25zn0243j3bgclvfyxipx4", - "version": "5.10.140" + "sha256": "0s52vfvw5pgnq7gq9n66ib05ryhkxwv765f16862l5gykbdynirz", + "version": "5.10.142" }, "5.15": { "patch": { From fa2034286c530218e517f571cc941ef41741ce2d Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Fri, 9 Sep 2022 15:58:49 -0300 Subject: [PATCH 33/52] linux/hardened/patches/5.15: 5.15.64-hardened1 -> 5.15.67-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 60ae8240c89a..9c96dd19bfe6 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -32,12 +32,12 @@ "5.15": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.15.64-hardened1.patch", - "sha256": "08hj5rx37vmw8mapzz15smpp775vrzhbfh2i0xps5qwi9majywrf", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.64-hardened1/linux-hardened-5.15.64-hardened1.patch" + "name": "linux-hardened-5.15.67-hardened1.patch", + "sha256": "1151dry0ia25rq50vnvrkjsxz5h9zsr6lahld3vilk2p01bv2fc3", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.67-hardened1/linux-hardened-5.15.67-hardened1.patch" }, - "sha256": "0l6ylmxhk3lqz2zyqcbyhbfcq1p8i84g0p1d6x0q6yd3dy6d78f6", - "version": "5.15.64" + "sha256": "0h7r2k59jsw8ykb2p7nxrpazbwx1n5p3nmfbbj1lhib91fldjiys", + "version": "5.15.67" }, "5.18": { "patch": { From 722d9d0d00d311840af8fcd3dc6208b9126b7fc9 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Fri, 9 Sep 2022 15:58:58 -0300 Subject: [PATCH 34/52] linux/hardened/patches/5.19: 5.19.6-hardened1 -> 5.19.8-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 9c96dd19bfe6..52540647c46e 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -52,12 +52,12 @@ "5.19": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.19.6-hardened1.patch", - "sha256": "1lx4li0f0j6wmh3p75hr2qa780ckybhma8s34p6xlbvxz054ncpr", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.19.6-hardened1/linux-hardened-5.19.6-hardened1.patch" + "name": "linux-hardened-5.19.8-hardened1.patch", + "sha256": "1j7wg4hq06drxr42jl89za1f7x52d4ck5i38p4njz4j415ihsiys", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.19.8-hardened1/linux-hardened-5.19.8-hardened1.patch" }, - "sha256": "0fm6xysg5mjfig0jils700ph83mvvkl27ix757260i31mwjgi921", - "version": "5.19.6" + "sha256": "1kl7fifsa6vsm34xg3kd2svhx18n771hfj67nhwnlalmb9whhqv1", + "version": "5.19.8" }, "5.4": { "patch": { From 1f1aca42d0166f87fd098920141f79f9dc07b9cc Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Fri, 9 Sep 2022 15:59:06 -0300 Subject: [PATCH 35/52] linux/hardened/patches/5.4: 5.4.211-hardened1 -> 5.4.212-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 52540647c46e..f42c979417a7 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -62,11 +62,11 @@ "5.4": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.4.211-hardened1.patch", - "sha256": "061c1c3ha88798l9q3n2dd3ankvw0hlz8f8cisxljpzfj4napk8z", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.211-hardened1/linux-hardened-5.4.211-hardened1.patch" + "name": "linux-hardened-5.4.212-hardened1.patch", + "sha256": "0vdx78n1aggyfia017h40k6xg7bd2spcv3s4m0kiq693skxzlh4x", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.212-hardened1/linux-hardened-5.4.212-hardened1.patch" }, - "sha256": "1v1dgsk66fi6x6v9k6hg9ik3f3b3pv7a3gk8mybmgm9cnx0k5d5z", - "version": "5.4.211" + "sha256": "1hngr4hsrcd6hmlyvc3msy5racniav2jagp5abmp7xsxv0yjxiq9", + "version": "5.4.212" } } From d97745164d0c352a4ffdffbb0ea7b292c04e060c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 Sep 2022 16:18:04 +0000 Subject: [PATCH 36/52] python310Packages.pypdf2: 2.10.4 -> 2.10.6 --- pkgs/development/python-modules/pypdf2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pypdf2/default.nix b/pkgs/development/python-modules/pypdf2/default.nix index d9522d63a745..b183b20a5272 100644 --- a/pkgs/development/python-modules/pypdf2/default.nix +++ b/pkgs/development/python-modules/pypdf2/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "PyPDF2"; - version = "2.10.4"; + version = "2.10.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-8JDF/HmQz1ptY2TOI2KDSXTjITbVIpG6uyNy5dZH0Yg="; + sha256 = "sha256-kSKmRB9sELkrAmKpX5wE9VL+RJjybn3G49JvwKWBU84="; }; LC_ALL = "en_US.UTF-8"; From 8c76ca10491bd241cf3f1bb211f5d9a0a93a958d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 Sep 2022 16:10:30 +0000 Subject: [PATCH 37/52] python310Packages.pymanopt: 2.0.0 -> 2.0.1 --- pkgs/development/python-modules/pymanopt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymanopt/default.nix b/pkgs/development/python-modules/pymanopt/default.nix index cc6cef776691..f299c4900f27 100644 --- a/pkgs/development/python-modules/pymanopt/default.nix +++ b/pkgs/development/python-modules/pymanopt/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "pymanopt"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-dqyduExNgXIbEFlgkckaPfhLFSVLqPgwAOyBUdowwiQ="; + sha256 = "sha256-VwCUqKI1PkR8nUVaa73bkTw67URKPaza3VU9g+rB+Mg="; }; propagatedBuildInputs = [ numpy scipy torch ]; From 77a0ee33d06101bd124ca85e017711896e08cb86 Mon Sep 17 00:00:00 2001 From: DarkOnion0 Date: Fri, 9 Sep 2022 21:30:41 +0200 Subject: [PATCH 38/52] drawio: 20.2.3 -> 20.3.0 --- pkgs/applications/graphics/drawio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index 1080f56ebe91..e755b708a063 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "drawio"; - version = "20.2.3"; + version = "20.3.0"; src = fetchurl { url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/drawio-x86_64-${version}.rpm"; - sha256 = "sha256-O/gzXAzvaYJXpexjBSc6jNW1wX0ukwQcpFU8fq4qM4k="; + sha256 = "bfcd363f549ce8dc13ae2287cec5099e4bf1d0d4b6f8deef40a81279f78817e1"; }; nativeBuildInputs = [ From d7292372c687e1c4f103a06c36dcea640ee3f97c Mon Sep 17 00:00:00 2001 From: DarkOnion0 Date: Fri, 9 Sep 2022 21:44:45 +0200 Subject: [PATCH 39/52] devspace: 6.0.1 -> 6.1.0 --- pkgs/development/tools/misc/devspace/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/devspace/default.nix b/pkgs/development/tools/misc/devspace/default.nix index c0489cdab04b..827a3bd4d536 100644 --- a/pkgs/development/tools/misc/devspace/default.nix +++ b/pkgs/development/tools/misc/devspace/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "devspace"; - version = "6.0.1"; + version = "6.1.0"; src = fetchFromGitHub { owner = "loft-sh"; repo = "devspace"; rev = "v${version}"; - sha256 = "sha256-YT/DGxdsMXjCp908U2jfkQpDBPCTNjObdeIj06Bum/U="; + sha256 = "sha256-pbI49oklxTu02YNIA1uxcDqWwGf3LaKipErDHCVxRRc="; }; vendorSha256 = null; From b7f6ec4ae6abdbeb909008534c4367a7b3206161 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 23 Jul 2022 15:47:49 +0000 Subject: [PATCH 40/52] =?UTF-8?q?gtk4:=204.6.6=20=E2=86=92=204.8.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gtk/-/compare/4.6.6...4.8.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/gtk/4.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix index fc3e39b02261..5c4bc0430d84 100644 --- a/pkgs/development/libraries/gtk/4.x.nix +++ b/pkgs/development/libraries/gtk/4.x.nix @@ -62,7 +62,7 @@ in stdenv.mkDerivation rec { pname = "gtk4"; - version = "4.6.6"; + version = "4.8.0"; outputs = [ "out" "dev" ] ++ lib.optionals x11Support [ "devdoc" ]; outputBin = "dev"; @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk/${lib.versions.majorMinor version}/gtk-${version}.tar.xz"; - sha256 = "e7/k0TVp98KX7UmDSscmPjGLe/EC0ycctGbVlx9ZrnA="; + sha256 = "yNYgNDfR41nYMSTcWRVG1AP2fjsAVE5T3VCpuqzcvX8="; }; nativeBuildInputs = [ From 1dee1a988e4f728c23f75db074e7424095794223 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 Sep 2022 20:10:24 +0000 Subject: [PATCH 41/52] python310Packages.pytorch-pfn-extras: 0.6.0 -> 0.6.1 --- .../development/python-modules/pytorch-pfn-extras/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytorch-pfn-extras/default.nix b/pkgs/development/python-modules/pytorch-pfn-extras/default.nix index 639c13508c57..e3c27eda9ef1 100644 --- a/pkgs/development/python-modules/pytorch-pfn-extras/default.nix +++ b/pkgs/development/python-modules/pytorch-pfn-extras/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "pytorch-pfn-extras"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "pfnet"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-w4WSEgNLdVLDnKS4kzJBK9BkrrGzbk2aCIhk4HCM/Bk="; + sha256 = "sha256-wxTs/hfgqJn4DCxZj87V/zDKZc+thx3o5bWAvZe7EJU="; }; propagatedBuildInputs = [ numpy packaging torch typing-extensions ]; From 8c4a3970984bdeb8bd4846cd040f292c10997d36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Fri, 9 Sep 2022 17:15:55 -0300 Subject: [PATCH 42/52] mate.caja-extensions: 1.26.0 -> 1.26.1 --- pkgs/desktops/mate/caja-extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/caja-extensions/default.nix b/pkgs/desktops/mate/caja-extensions/default.nix index cc3a6ce30cab..0d1dd2baa1b2 100644 --- a/pkgs/desktops/mate/caja-extensions/default.nix +++ b/pkgs/desktops/mate/caja-extensions/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "caja-extensions"; - version = "1.26.0"; + version = "1.26.1"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "03zwv3yl5553cnp6jjn7vr4l28dcdhsap7qimlrbvy20119kj5gh"; + sha256 = "WJwZ4/oQJC1iOaXMuVhVmENqVuvpTS6ypQtZUMzh1SA="; }; nativeBuildInputs = [ From a674ecd28546ec9241d3318f889b5e114886b6b5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 Sep 2022 17:15:29 +0000 Subject: [PATCH 43/52] python310Packages.pysensibo: 1.0.18 -> 1.0.19 --- pkgs/development/python-modules/pysensibo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysensibo/default.nix b/pkgs/development/python-modules/pysensibo/default.nix index f5817917c9ab..5bdf9979de9d 100644 --- a/pkgs/development/python-modules/pysensibo/default.nix +++ b/pkgs/development/python-modules/pysensibo/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pysensibo"; - version = "1.0.18"; + version = "1.0.19"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "andrey-git"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-sFEeN72+h6yFQFluhOQfxoVJPB5lCpFnlJfLnRxVjFg="; + hash = "sha256-pqg+NsdbSyXgC+4/AtbI4BZ5h2pMhvvBdQI9lHj6HME="; }; propagatedBuildInputs = [ From 604afd43fbba2141d3af6ea810618e151aa64c89 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 Sep 2022 17:21:28 +0000 Subject: [PATCH 44/52] python310Packages.pyslurm: 21.08.4 -> 22.5.0 --- pkgs/development/python-modules/pyslurm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyslurm/default.nix b/pkgs/development/python-modules/pyslurm/default.nix index 248ccc41033b..f1e2a90daa9e 100644 --- a/pkgs/development/python-modules/pyslurm/default.nix +++ b/pkgs/development/python-modules/pyslurm/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pyslurm"; - version = "21.08.4"; + version = "22.5.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { repo = "pyslurm"; owner = "PySlurm"; - rev = "v${version}"; - hash = "sha256-9ZYTBO8g+5B9D8Ll5JjkJYFyh0RQNIjxg958UZoCNmA="; + rev = "refs/tags/v${version}"; + hash = "sha256-Uh0P7Kevcc78vWT/Zk+MUCKh2AlDiRR3MO/nOke2yP0="; }; buildInputs = [ cython slurm ]; From aaacde10094427969589d6641017b6e2a3986d2c Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 9 Sep 2022 09:47:42 +0200 Subject: [PATCH 45/52] chromiumDev: 106.0.5249.21 -> 107.0.5286.2 --- .../networking/browsers/chromium/upstream-info.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 79d23bfca362..359b0a026c98 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -32,15 +32,15 @@ } }, "dev": { - "version": "106.0.5249.21", - "sha256": "0d3ha2r54sjx1rhaas0mrgk2dl4xvgb83r5pbq9qzh52z43ynmlv", - "sha256bin64": "0bawgqjkpllqif0jaah43vys57c9y8w7a5rjn35bxlmjrfmfwhwc", + "version": "107.0.5286.2", + "sha256": "111dk9qdxbad2agvnh8ijb18ip9vw32gdfxajqkrlqgcmmj61vsz", + "sha256bin64": "0l19ylpcrnzqj2imlhl13h0f5773znwx6h4xjzrac2z2lxkzmkmk", "deps": { "gn": { - "version": "2022-08-11", + "version": "2022-08-31", "url": "https://gn.googlesource.com/gn", - "rev": "0bcd37bd2b83f1a9ee17088037ebdfe6eab6d31a", - "sha256": "13zks2z65kg7fzzsysq4mswd4bhhy3h7ycdrpxfilcvixx2n2gac" + "rev": "00b741b1568d56cf4e117dcb9f70cd42653b4c78", + "sha256": "0vi9gigzdyji8fql8k8sv1v5z0icjph8awz49xidn26bvly6526g" } } }, From f31881a6198af697e80ce7bf322fddd469176d43 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 Sep 2022 16:29:01 +0000 Subject: [PATCH 46/52] python310Packages.pypinyin: 0.47.0 -> 0.47.1 --- pkgs/development/python-modules/pypinyin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pypinyin/default.nix b/pkgs/development/python-modules/pypinyin/default.nix index 0f6a9407f49d..4f79d50e3673 100644 --- a/pkgs/development/python-modules/pypinyin/default.nix +++ b/pkgs/development/python-modules/pypinyin/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "pypinyin"; - version = "0.47.0"; + version = "0.47.1"; src = fetchFromGitHub { owner = "mozillazg"; repo = "python-pinyin"; rev = "refs/tags/v${version}"; - sha256 = "sha256-DsSrWbnBFEGQTXP1+C8j5RqSplDitsFl+13YwwE+3pE="; + sha256 = "sha256-c9pEO9k5tCFWLPismrXrrYEQYmxYKkciXFgpbrDEGzE="; }; postPatch = '' From 17bc96df08471d36e6ab20e199679243d3ee8166 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 8 Sep 2022 00:37:38 +0200 Subject: [PATCH 47/52] common-updater-scripts: Fix replacement failure detections MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Previously, we only made `sed` back up the version replacement. This meant that `cmp` would already recognize the files as changed before replacing hash and the other values, and the error would not be printed. Let’s always make the `sed` create a backup so that we can detect success of each situation. This will no longer allow us to revert to the original version on failure but the updated file should be tracked in git anyway. --- .../scripts/update-source-version | 25 ++++++++----------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/pkgs/common-updater/scripts/update-source-version b/pkgs/common-updater/scripts/update-source-version index fbeb375fa891..a3a7bde17f85 100755 --- a/pkgs/common-updater/scripts/update-source-version +++ b/pkgs/common-updater/scripts/update-source-version @@ -206,30 +206,28 @@ oldHashEscaped=$(echo "$oldHash" | sed -re 's|[+]|\\&|g') tempHashEscaped=$(echo "$tempHash" | sed -re 's|[+]|\\&|g') # Replace new version -sed -i.bak "$nixFile" -re "$pattern" -if cmp -s "$nixFile" "$nixFile.bak"; then +sed -i.cmp "$nixFile" -re "$pattern" +if cmp -s "$nixFile" "$nixFile.cmp"; then die "Failed to replace version '$oldVersion' to '$newVersion' in '$attr'!" fi # Replace new URL if [[ -n "$newUrl" ]]; then - sed -i "$nixFile" -re "s|\"$oldUrlEscaped\"|\"$newUrl\"|" - - if cmp -s "$nixFile" "$nixFile.bak"; then + sed -i.cmp "$nixFile" -re "s|\"$oldUrlEscaped\"|\"$newUrl\"|" + if cmp -s "$nixFile" "$nixFile.cmp"; then die "Failed to replace source URL '$oldUrl' to '$newUrl' in '$attr'!" fi fi -sed -i "$nixFile" -re "s|\"$oldHashEscaped\"|\"$tempHash\"|" -if cmp -s "$nixFile" "$nixFile.bak"; then +sed -i.cmp "$nixFile" -re "s|\"$oldHashEscaped\"|\"$tempHash\"|" +if cmp -s "$nixFile" "$nixFile.cmp"; then die "Failed to replace source hash of '$attr' to a temporary hash!" fi # Replace new revision, if given if [[ -n "$newRevision" ]]; then - sed -i "$nixFile" -re "s|\"$oldRevision\"|\"$newRevision\"|" - - if cmp -s "$nixFile" "$nixFile.bak"; then + sed -i.cmp "$nixFile" -re "s|\"$oldRevision\"|\"$newRevision\"|" + if cmp -s "$nixFile" "$nixFile.cmp"; then die "Failed to replace source revision '$oldRevision' to '$newRevision' in '$attr'!" fi fi @@ -254,16 +252,15 @@ if [[ -z "$newHash" ]]; then fi if [[ -z "${ignoreSameHash}" && "$oldVersion" != "$newVersion" && "$oldHash" = "$newHash" ]]; then - mv "$nixFile.bak" "$nixFile" die "Both the old and new source hashes of '$attr.$sourceKey' were equivalent. Please fix the package's source URL to be dependent on '\${version}'!" fi -sed -i "$nixFile" -re "s|\"$tempHashEscaped\"|\"$newHash\"|" -if cmp -s "$nixFile" "$nixFile.bak"; then +sed -i.cmp "$nixFile" -re "s|\"$tempHashEscaped\"|\"$newHash\"|" +if cmp -s "$nixFile" "$nixFile.cmp"; then die "Failed to replace temporary source hash of '$attr' to the final source hash!" fi -rm -f "$nixFile.bak" +rm -f "$nixFile.cmp" rm -f "$attr.fetchlog" if [ -n "$printChanges" ]; then From ee1795cc87833d7c68b85a5d88e8bbb6228df813 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 8 Sep 2022 01:23:50 +0200 Subject: [PATCH 48/52] common-updater-scripts: Only look for URL when replacing it MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This would do a pointless slow `nix-instantiate` call for a feature that is rarely used – initially, it was added for Firefox updates https://github.com/NixOS/nixpkgs/commit/186de9ca9ef5650180f2f0cf0a9efdc7dfb16e2e but now not even that uses it. Additionally, this would break stuff like `cargoDeps`, which lack the url attributes. --- pkgs/common-updater/scripts/update-source-version | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/common-updater/scripts/update-source-version b/pkgs/common-updater/scripts/update-source-version index a3a7bde17f85..480fb7b2265c 100755 --- a/pkgs/common-updater/scripts/update-source-version +++ b/pkgs/common-updater/scripts/update-source-version @@ -133,12 +133,6 @@ if [[ $(grep --count "$oldHash" "$nixFile") != 1 ]]; then die "Couldn't locate old source hash '$oldHash' (or it appeared more than once) in '$nixFile'!" fi -oldUrl=$(nix-instantiate $systemArg --eval -E "with $importTree; builtins.elemAt ($attr.$sourceKey.drvAttrs.urls or [ $attr.$sourceKey.url ]) 0" | tr -d '"') - -if [[ -z "$oldUrl" ]]; then - die "Couldn't evaluate source url from '$attr.$sourceKey'!" -fi - oldVersion=$(nix-instantiate $systemArg --eval -E "with $importTree; $attr.${versionKey} or (builtins.parseDrvName $attr.name).version" | tr -d '"') if [[ -z "$oldVersion" ]]; then @@ -162,7 +156,6 @@ fi # Escape regex metacharacter that are allowed in store path names oldVersionEscaped=$(echo "$oldVersion" | sed -re 's|[.+]|\\&|g') -oldUrlEscaped=$(echo "$oldUrl" | sed -re 's|[${}.+]|\\&|g') if [[ $(grep --count --extended-regexp "^\s*(let\b)?\s*$versionKey\s*=\s*\"$oldVersionEscaped\"" "$nixFile") = 1 ]]; then pattern="/\b$versionKey\b\s*=/ s|\"$oldVersionEscaped\"|\"$newVersion\"|" @@ -213,6 +206,14 @@ fi # Replace new URL if [[ -n "$newUrl" ]]; then + oldUrl=$(nix-instantiate $systemArg --eval -E "with $importTree; builtins.elemAt ($attr.$sourceKey.drvAttrs.urls or [ $attr.$sourceKey.url ]) 0" | tr -d '"') + if [[ -z "$oldUrl" ]]; then + die "Couldn't evaluate source url from '$attr.$sourceKey'!" + fi + + # Escape regex metacharacter that are allowed in store path names + oldUrlEscaped=$(echo "$oldUrl" | sed -re 's|[${}.+]|\\&|g') + sed -i.cmp "$nixFile" -re "s|\"$oldUrlEscaped\"|\"$newUrl\"|" if cmp -s "$nixFile" "$nixFile.cmp"; then die "Failed to replace source URL '$oldUrl' to '$newUrl' in '$attr'!" From a87d3f897b649058b7896f55062063df777e20ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 9 Sep 2022 22:39:25 +0200 Subject: [PATCH 49/52] qemu: make sure to not mix python versions --- pkgs/applications/virtualization/qemu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 3d8d87ec2274..8e7a683ed33e 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, python3, python3Packages, zlib, pkg-config, glib, buildPackages +{ lib, stdenv, fetchurl, fetchpatch, python3, zlib, pkg-config, glib, buildPackages , perl, pixman, vde2, alsa-lib, texinfo, flex , bison, lzo, snappy, libaio, libtasn1, gnutls, nettle, curl, ninja, meson, sigtool , makeWrapper, runtimeShell, removeReferencesTo @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ makeWrapper removeReferencesTo pkg-config flex bison meson ninja perl python3 python3Packages.sphinx python3Packages.sphinx-rtd-theme ] + nativeBuildInputs = [ makeWrapper removeReferencesTo pkg-config flex bison meson ninja perl python3 python3.pkgs.sphinx python3.pkgs.sphinx-rtd-theme ] ++ lib.optionals gtkSupport [ wrapGAppsHook ] ++ lib.optionals stdenv.isDarwin [ sigtool ]; From 3f82e22e23f2defc214b2ad7a791924a6f27dd90 Mon Sep 17 00:00:00 2001 From: Tom Hall Date: Fri, 9 Sep 2022 20:31:42 +0100 Subject: [PATCH 50/52] okular: add required dependency on all platforms Chmlib is no longer optional by default (if you want to build without it, you have to explicitly say so with a cmake flag). See https://invent.kde.org/graphics/okular/-/commit/913d437822f23730d10bf97c3ed9201f936a33a2 --- pkgs/applications/kde/okular.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/kde/okular.nix b/pkgs/applications/kde/okular.nix index 87aeff1f912a..51994c2868dd 100644 --- a/pkgs/applications/kde/okular.nix +++ b/pkgs/applications/kde/okular.nix @@ -1,7 +1,7 @@ { stdenv, mkDerivation, lib, extra-cmake-modules, kdoctools, - breeze-icons, chmlib ? null, discount, djvulibre, ebook_tools, kactivities, + breeze-icons, chmlib, discount, djvulibre, ebook_tools, kactivities, karchive, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdegraphics-mobipocket, kiconthemes, kjs, khtml, kio, kparts, kpty, kpurpose, kwallet, kwindowsystem, libkexiv2, libspectre, libzip, phonon, poppler, @@ -16,8 +16,8 @@ mkDerivation { kcompletion kconfig kconfigwidgets kcoreaddons kdbusaddons kdegraphics-mobipocket kiconthemes kjs khtml kio kparts kpty kpurpose kwallet kwindowsystem libkexiv2 libspectre libzip phonon poppler qca-qt5 - qtdeclarative qtsvg threadweaver kcrash qtspeech - ] ++ lib.optional (!stdenv.isAarch64) chmlib; + qtdeclarative qtsvg threadweaver kcrash qtspeech chmlib + ]; # InitialPreference values are too high and end up making okular # default for anything considered text/plain. Resetting to 1, which From 63ac216215fbb5125459afc6264a088d77efc07d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Fri, 9 Sep 2022 21:20:13 +0000 Subject: [PATCH 51/52] rofi-bluetooth: init at unstable-2021-03-05 (#185883) Co-authored-by: Sandro --- .../misc/rofi-bluetooth/default.nix | 41 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/applications/misc/rofi-bluetooth/default.nix diff --git a/pkgs/applications/misc/rofi-bluetooth/default.nix b/pkgs/applications/misc/rofi-bluetooth/default.nix new file mode 100644 index 000000000000..ed80e5d5af0e --- /dev/null +++ b/pkgs/applications/misc/rofi-bluetooth/default.nix @@ -0,0 +1,41 @@ +{ lib +, stdenv +, fetchFromGitHub +, makeWrapper +, rofi-unwrapped +, bluez +}: + +stdenv.mkDerivation rec { + pname = "rofi-bluetooth"; + version = "unstable-2021-03-05"; + + src = fetchFromGitHub { + owner = "nickclyde"; + repo = "rofi-bluetooth"; + # https://github.com/nickclyde/rofi-bluetooth/issues/19 + rev = "893db1f2b549e7bc0e9c62e7670314349a29cdf2"; + sha256 = "sha256-3oROJKEQCuSnLfbJ+JSSc9hcmJTPrLHRQJsrUcaOMss="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + + install -D --target-directory=$out/bin/ ./rofi-bluetooth + + wrapProgram $out/bin/rofi-bluetooth \ + --prefix PATH ":" ${lib.makeBinPath [ rofi-unwrapped bluez ] } + + runHook postInstall + ''; + + meta = with lib; { + description = "Rofi-based interface to connect to bluetooth devices and display status info"; + homepage = "https://github.com/nickclyde/rofi-bluetooth"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ MoritzBoehme ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 54481fea354a..5ad70e1a4d6d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29534,6 +29534,8 @@ with pkgs; rofi-mpd = callPackage ../applications/audio/rofi-mpd { }; + rofi-bluetooth = callPackage ../applications/misc/rofi-bluetooth { }; + rofi-calc = callPackage ../applications/science/math/rofi-calc { }; rofi-emoji = callPackage ../applications/misc/rofi-emoji { }; From b731b8d78d1a86e02c780bfae0d9a9f2b867b3a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 9 Sep 2022 18:21:06 -0300 Subject: [PATCH 52/52] xfce.xfce4-notifyd: 0.6.3 -> 0.6.4 (#189738) --- .../applications/xfce4-notifyd/default.nix | 28 +++++++++++++++---- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix b/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix index 8a50a0d0fa7c..8a376862d9c9 100644 --- a/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix @@ -1,14 +1,32 @@ -{ lib, mkXfceDerivation, glib, gtk3, libnotify, libxfce4ui, libxfce4util -, xfce4-panel, xfconf }: +{ lib +, mkXfceDerivation +, glib +, gtk3 +, libnotify +, libxfce4ui +, libxfce4util +, xfce4-panel +, xfconf +}: mkXfceDerivation { category = "apps"; pname = "xfce4-notifyd"; - version = "0.6.3"; + version = "0.6.4"; - sha256 = "sha256-JcHxqKLl4F4FQv7lE64gWUorCvl5g5mSD+jEmj1ORfY="; + sha256 = "sha256-H/qAfgwM0qaIxpVlSAUJJ4/Z3WtvYxJb2TtjKHK6AjE="; - buildInputs = [ gtk3 glib libnotify libxfce4ui libxfce4util xfce4-panel xfconf ]; + buildInputs = [ + gtk3 + glib + libnotify + libxfce4ui + libxfce4util + xfce4-panel + xfconf + ]; + + NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; configureFlags = [ "--enable-dbus-start-daemon"