From 643f7c5aa24a3d4c4cddb9811feeda2a1d81a912 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Sep 2024 11:42:26 +0000 Subject: [PATCH 01/18] signal-desktop: 7.24.1 -> 7.25.0 (cherry picked from commit e644b0d350c53a4633b7d1f596bc1641a4ba7ae6) --- .../instant-messengers/signal-desktop/signal-desktop.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix index 1277c5752787..40666c4eca30 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix @@ -2,7 +2,7 @@ callPackage ./generic.nix { } rec { pname = "signal-desktop"; dir = "Signal"; - version = "7.24.1"; + version = "7.25.0"; url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - hash = "sha256-wT8pbUcdDYVEVAOroHeORl4+rwzfWJvZNxC1pnNsnjQ="; + hash = "sha256-KcVCQkDSpI+eq2/wvPZxq6ILLQk3xe+wrKfbnJnTQTo="; } From 2e74e35bbc89eaad3289ffcd457c609b65df1238 Mon Sep 17 00:00:00 2001 From: Konrad Malik Date: Mon, 23 Sep 2024 14:13:13 +0200 Subject: [PATCH 02/18] usage: init at 0.3.1 (cherry picked from commit 08d1584a0b8e74b00d9fb4972283e2ac6dc82f4d) --- pkgs/by-name/us/usage/package.nix | 36 +++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 pkgs/by-name/us/usage/package.nix diff --git a/pkgs/by-name/us/usage/package.nix b/pkgs/by-name/us/usage/package.nix new file mode 100644 index 000000000000..96406b363602 --- /dev/null +++ b/pkgs/by-name/us/usage/package.nix @@ -0,0 +1,36 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + nix-update-script, + usage, + testers, +}: + +rustPlatform.buildRustPackage rec { + pname = "jdx"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "jdx"; + repo = "usage"; + rev = "v${version}"; + hash = "sha256-9zQ+gkBVhzjqSIieGjxoD9vc7999lfRQ7awkvlEkseE="; + }; + + cargoHash = "sha256-4ebjD1Tf7F2YyNrF7eEi2yKonctprnyu4nMf+vE2whY="; + + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { package = usage; }; + }; + + meta = { + homepage = "https://usage.jdx.dev"; + description = "Specification for CLIs"; + changelog = "https://github.com/jdx/usage/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ konradmalik ]; + mainProgram = "usage"; + }; +} From 488841fed56776f1f3c14a45baf2f8f98e33c743 Mon Sep 17 00:00:00 2001 From: Bryan Gardiner Date: Sat, 21 Sep 2024 10:29:11 -0700 Subject: [PATCH 03/18] nvd: switch source repository to Sourcehut nvd will be moving from Gitlab to Sourcehut shortly, and the old repository will be archived and removed, before NixOS 24.05 is out of support. --- pkgs/tools/package-management/nvd/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/package-management/nvd/default.nix b/pkgs/tools/package-management/nvd/default.nix index 8f33b4a5fbfa..f8109f6b70d0 100644 --- a/pkgs/tools/package-management/nvd/default.nix +++ b/pkgs/tools/package-management/nvd/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitLab +{ fetchFromSourcehut , installShellFiles , lib , python3 @@ -9,10 +9,10 @@ stdenv.mkDerivation (finalAttrs: { pname = "nvd"; version = "0.2.3"; - src = fetchFromGitLab { - owner = "khumba"; + src = fetchFromSourcehut { + owner = "~khumba"; repo = "nvd"; - rev = "refs/tags/v${finalAttrs.version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-TmaXsyJLRkmIN9D77jOXd8fLj7kYPCBLg0AHIImAtgA="; }; @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Nix/NixOS package version diff tool"; - homepage = "https://gitlab.com/khumba/nvd"; + homepage = "https://khumba.net/projects/nvd"; license = lib.licenses.asl20; mainProgram = "nvd"; maintainers = with lib.maintainers; [ khumba ]; From fbab02e64d957745fc618663aa5abc557540ac06 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 Sep 2024 06:11:15 +0000 Subject: [PATCH 04/18] outline: 0.79.0 -> 0.80.2 (cherry picked from commit 01525c4d9795e4f036f296163fe3aed834c91b6d) --- pkgs/servers/web-apps/outline/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/web-apps/outline/default.nix b/pkgs/servers/web-apps/outline/default.nix index 21f6d28e62a9..80ce924de035 100644 --- a/pkgs/servers/web-apps/outline/default.nix +++ b/pkgs/servers/web-apps/outline/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "outline"; - version = "0.79.0"; + version = "0.80.2"; src = fetchFromGitHub { owner = "outline"; repo = "outline"; rev = "v${version}"; - hash = "sha256-uu0HlQ3LaVBjSharROKv+mS8/qONV5qND/5kMTsaGeQ="; + hash = "sha256-kmi6H2vdzg7ftUOrzs2b5e9n1bSFHiQ0wk6Q6T/lDdk="; }; nativeBuildInputs = [ makeWrapper prefetch-yarn-deps fixup-yarn-lock ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { yarnOfflineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - hash = "sha256-S2vKYVIFsSlPqFbpLhBH9S43Invo3hsNLvfLX98922Y="; + hash = "sha256-Ibgn/J2OCP2F0hbPQi35uGAOfoZ2D5HD/E85oOTr6G0="; }; configurePhase = '' From 69d489f347be2088b8010398adb97eb8205bf8f8 Mon Sep 17 00:00:00 2001 From: Michael Evans Date: Sat, 28 Sep 2024 14:56:12 +0200 Subject: [PATCH 05/18] chess-clock: 0.6.0 -> 0.6.1 (#344378) (cherry picked from commit 7f6277f84bf58a41de632d47dbc2e51794fbc73e) --- pkgs/by-name/ch/chess-clock/package.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ch/chess-clock/package.nix b/pkgs/by-name/ch/chess-clock/package.nix index 9e36fc97d00a..2074e5404c41 100644 --- a/pkgs/by-name/ch/chess-clock/package.nix +++ b/pkgs/by-name/ch/chess-clock/package.nix @@ -15,14 +15,14 @@ stdenv.mkDerivation rec { pname = "chess-clock"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = pname; rev = "v${version}"; - hash = "sha256-wwNOop2V84vZO3JV0+VZ+52cKPx8xJg2rLkjfgc/+n4="; + hash = "sha256-XDOCHFZC3s3b/4kD1ZkhWar3kozW3vXc0pk7O6oQfiE="; }; nativeBuildInputs = [ @@ -45,10 +45,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Time games of over-the-board chess"; - mainProgram = "chess-clock"; homepage = "https://gitlab.gnome.org/World/chess-clock"; - changelog = "https://gitlab.gnome.org/World/chess-clock/-/releases/v${version}"; license = licenses.gpl3Plus; + mainProgram = "chess-clock"; maintainers = with maintainers; [ michaelgrahamevans ]; }; } From 19a38a0d75f127b5f33c4246601ac6921a0972ad Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Mon, 30 Sep 2024 14:11:44 +0200 Subject: [PATCH 06/18] mastodon: 4.2.12 -> 4.2.13 Changelog: https://github.com/mastodon/mastodon/releases/tag/v4.2.13 (cherry picked from commit fb7950b962e2a3637bc97e4dbed6870ddca806d5) --- pkgs/servers/mastodon/gemset.nix | 55 +++++++++++++------------------- pkgs/servers/mastodon/source.nix | 4 +-- 2 files changed, 24 insertions(+), 35 deletions(-) diff --git a/pkgs/servers/mastodon/gemset.nix b/pkgs/servers/mastodon/gemset.nix index d6e73054a717..20be6e58e3d8 100644 --- a/pkgs/servers/mastodon/gemset.nix +++ b/pkgs/servers/mastodon/gemset.nix @@ -610,10 +610,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qh1b14jwbbj242klkyz5fc7npd4j0mvndz62gajhvl1l3wd7zc2"; + sha256 = "0chwfdq2a6kbj6xz9l6zrdfnyghnh32si82la1dnpa5h75ir5anl"; type = "gem"; }; - version = "1.2.3"; + version = "1.3.4"; }; connection_pool = { groups = ["default" "test"]; @@ -895,10 +895,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d2z4ky2v15dpcz672i2p7lb2nc793dasq3yq3660h2az53kss9v"; + sha256 = "0r6zylqjfv0xhdxvldr0kgmnglm57nm506pcm6085f0xqa68cvnj"; type = "gem"; }; - version = "1.2.7"; + version = "1.2.11"; }; excon = { groups = ["default"]; @@ -1144,10 +1144,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cm2lrvhrpqq19hbdsxf4lq2nkb2qdldbdxh3gvi15l62dlb5zqq"; + sha256 = "0s4qhq3mjl0gak5wl20w9d5jhq069mk1393dkj76s8i2pvkqb578"; type = "gem"; }; - version = "1.8.1"; + version = "1.11.1"; }; fuubar = { dependencies = ["rspec-core" "ruby-progressbar"]; @@ -1881,10 +1881,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vz1ychq2fhfqjgqdrx8bqkaxg5dzcgwnah00m57ydylczfy8pwk"; + sha256 = "15gysw8rassqgdq3kwgl4mhqmrgh7nk2qvrcqp4ijyqazgywn6gq"; type = "gem"; }; - version = "1.16.6"; + version = "1.16.7"; }; nsa = { dependencies = ["activesupport" "concurrent-ruby" "sidekiq" "statsd-ruby"]; @@ -1913,10 +1913,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15xjsxis357np7dy1lak39x1n8g8wxljb08wplw5i4gxi743zr7j"; + sha256 = "1km0wqx9pj609jidvrqfsvzbzfgdnlpdnv7i7xfqm3wb55vk5w6y"; type = "gem"; }; - version = "2.1.1"; + version = "2.1.2"; }; omniauth-cas = { dependencies = ["addressable" "nokogiri" "omniauth"]; @@ -1948,10 +1948,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01k9rkg97npcgm8r4x3ja8y20hsg4zy0dcjpzafx148q4yxbg74n"; + sha256 = "05idjrc01nmmqz4g7kv16xd9yfzzvyibxzfrxk8rcwd1p0zgsxnb"; type = "gem"; }; - version = "2.1.0"; + version = "2.1.2"; }; omniauth_openid_connect = { dependencies = ["omniauth" "openid_connect"]; @@ -2127,10 +2127,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0i2vaww6qcazj0ywva1plmjnj6rk23b01szswc5jhcq7s2cikd1y"; + sha256 = "0gml1rixrfb0naciq3mrnqkpcvm9ahgps1c04hzxh4b801f69914"; type = "gem"; }; - version = "6.4.2"; + version = "6.4.3"; }; pundit = { dependencies = ["activesupport"]; @@ -2158,10 +2158,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01b9662zd2x9bp4rdjfid07h09zxj7kvn7f5fghbqhzc625ap1dp"; + sha256 = "0byn0c9nkahsl93y9ln5bysq4j31q8xkf2ws42swighxd4lnjzsa"; type = "gem"; }; - version = "1.7.3"; + version = "1.8.1"; }; rack = { groups = ["default" "development" "pam_authentication" "production" "test"]; @@ -2212,10 +2212,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1a12m1mv8dc0g90fs1myvis8vsgr427k1arg1q4a9qlfw6fqyhis"; + sha256 = "1kpm67az1wxlg76h620in2r7agfyhv177ps268j5ggsanzddzih8"; type = "gem"; }; - version = "3.0.5"; + version = "3.0.6"; }; rack-proxy = { dependencies = ["rack"]; @@ -2435,15 +2435,14 @@ version = "3.1.0"; }; rexml = { - dependencies = ["strscan"]; groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gccz5lixnddazvhksmj7l7hjwzjra2kz3qfyrzl2bz1q9h80bzh"; + sha256 = "09shc1dvg88c4yx83d4c9wf26z838nlapa3cmlq8iqdci39a98v2"; type = "gem"; }; - version = "3.3.5"; + version = "3.3.7"; }; rotp = { groups = ["default"]; @@ -2674,10 +2673,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18vnbzin5ypxrgcs9lllg7x311b69dyrdw2w1pwz84438hmxm79s"; + sha256 = "1adq06m684gnpjp6qyb8shgj8jjy2npcfg7y6mg2ab9ilfdq6684"; type = "gem"; }; - version = "1.15.0"; + version = "1.17.0"; }; ruby2_keywords = { groups = ["default"]; @@ -2946,16 +2945,6 @@ }; version = "0.8.0"; }; - strscan = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0mamrl7pxacbc79ny5hzmakc9grbjysm3yy6119ppgsg44fsif01"; - type = "gem"; - }; - version = "3.1.0"; - }; swd = { dependencies = ["activesupport" "attr_required" "httpclient"]; groups = ["default"]; diff --git a/pkgs/servers/mastodon/source.nix b/pkgs/servers/mastodon/source.nix index 0b2fd5b57e09..dccf253ea938 100644 --- a/pkgs/servers/mastodon/source.nix +++ b/pkgs/servers/mastodon/source.nix @@ -1,7 +1,7 @@ # This file was generated by pkgs.mastodon.updateScript. { fetchFromGitHub, applyPatches, patches ? [] }: let - version = "4.2.12"; + version = "4.2.13"; in ( applyPatches { @@ -9,7 +9,7 @@ in owner = "mastodon"; repo = "mastodon"; rev = "v${version}"; - hash = "sha256-q+j7zHJrIUOumJfk4w5BVu7eTUa1AjI5ho8XoOA2uJU="; + hash = "sha256-+HGu02fjYJ1x6Tk9AdqmFN7JHk3UnlvCdiQ/5yMu69M="; }; patches = patches ++ []; }) // { From 5244336058d861ad3cc4b103e6468c9a7af6dc85 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 27 Sep 2024 15:00:10 +0200 Subject: [PATCH 07/18] nss_latest: 3.104 -> 3.105 https://groups.google.com/a/mozilla.org/g/dev-tech-crypto/c/vh2mZemCg4E (cherry picked from commit 1962209f7653968826702d8c4d1ec4c7671a92d6) --- pkgs/development/libraries/nss/latest.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nss/latest.nix b/pkgs/development/libraries/nss/latest.nix index b2d040232374..143bb32a5677 100644 --- a/pkgs/development/libraries/nss/latest.nix +++ b/pkgs/development/libraries/nss/latest.nix @@ -5,6 +5,6 @@ # Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert import ./generic.nix { - version = "3.104"; - hash = "sha256-TEGEKocapU5OTqx69n8nrn/X3SZr49d1alHM73UnDJw="; + version = "3.105"; + hash = "sha256-Nfd7u0sdGqUCznnUxEJQFs+QuRSb+b7rZrcvKryimOQ="; } From 8344c101f3f06e85503ae88d8bd687e960bf8c58 Mon Sep 17 00:00:00 2001 From: Philipp Schuster Date: Mon, 30 Sep 2024 08:40:27 +0200 Subject: [PATCH 08/18] strace: set enableParallelBuilding = true This reduces the build time from 55s to 25s on my modern 16-core machine. The main motivation for this step is that I apply a custom patch onto strace in my NixOS configuration and the build time is longer than necessary. The debian package definition shows [0] that strace can be reliably build using multiple makefile jobs. [0] https://github.com/strace/strace/commit/0c56f62207d81713f9ce7705e865b75f921e6a1b (cherry picked from commit dfcde7121636fe8bd7f03fff31d9119d4bfbb5a8) --- pkgs/development/tools/misc/strace/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index 56fd222f989f..032938bf58e2 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ perl ]; + enableParallelBuilding = true; + # libunwind for -k. # On RISC-V platforms, LLVM's libunwind implementation is unsupported by strace. # The build will silently fall back and -k will not work on RISC-V. From 29f829e5ca32c740ff9b8e3b93bfb6f8f10345b8 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 30 Sep 2024 18:03:42 +0300 Subject: [PATCH 09/18] linux_testing: 6.11-rc7 -> 6.12-rc1 (cherry picked from commit 5e8d28572a313515bc65ff11e4f642c9f72107f0) --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index ba862f9551c7..d69c8cdcc7dd 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -1,7 +1,7 @@ { "testing": { - "version": "6.11-rc7", - "hash": "sha256:17c8vwvra042mib1s60nqqai0s7qc0qkvrf0j7ziqmy2llq8cbxy" + "version": "6.12-rc1", + "hash": "sha256:16zwvjcvgndvr0izx0qs2k7v85nvxwlx6j7y2yrdl3shalsdlmx2" }, "6.1": { "version": "6.1.111", From 562086149e97ce485276b5a7b7975251fee362d2 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 30 Sep 2024 18:03:47 +0300 Subject: [PATCH 10/18] linux_6_11: 6.11 -> 6.11.1 (cherry picked from commit 30c52da8a124c7396d3f60ccdaf5ed0ad7250ef3) --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index d69c8cdcc7dd..bb1ceee1de35 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -40,7 +40,7 @@ "hash": "sha256:15ihkbsj0idwzbvhynjm3kcnkk0alf3xipip8ngib1f1z13a0kgv" }, "6.11": { - "version": "6.11", - "hash": "sha256:0bnbvadm4wvnwzcq319gsgl03ijvvljn7mj8qw87ihpb4p0cdljm" + "version": "6.11.1", + "hash": "sha256:0ggfg3f8nkcgs2pg7y5ccfrcjzj7j7x4n41g59gzbsp1nirj6dra" } } From 14aaecf23700e742f475cb2047c8d4d0f249e7ef Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 30 Sep 2024 18:03:55 +0300 Subject: [PATCH 11/18] linux_6_10: 6.10.11 -> 6.10.12 (cherry picked from commit 8fa87fa112a0897411c3cbb859dac9c5c82cccf0) --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index bb1ceee1de35..908e16e6fe34 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -36,8 +36,8 @@ "hash": "sha256:08ngskni7d9wi93vlwcmbdg7sb2jl1drhhzn62k9nsrg1r7crrss" }, "6.10": { - "version": "6.10.11", - "hash": "sha256:15ihkbsj0idwzbvhynjm3kcnkk0alf3xipip8ngib1f1z13a0kgv" + "version": "6.10.12", + "hash": "sha256:1kvkwgnq5gsdqarrdg32qjrbq1dggxp1x2yy2zpsjsaq5y2mhj2j" }, "6.11": { "version": "6.11.1", From f7c914b0932cb1fe50f9349babe81940965440df Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 30 Sep 2024 18:04:00 +0300 Subject: [PATCH 12/18] linux_6_6: 6.6.52 -> 6.6.53 (cherry picked from commit 20380379dba41ba46a4a597b7afd74f5560acea6) --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 908e16e6fe34..528619abbe60 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -24,8 +24,8 @@ "hash": "sha256:0qj106lj554y1kdqj8kwyf7pk9bvrrpgz6s8zyh7d61mk7wws9sf" }, "6.6": { - "version": "6.6.52", - "hash": "sha256:1f5l6y7abscm01dr740fzvq8r756ar854n0i299smm4rhcsap48m" + "version": "6.6.53", + "hash": "sha256:0yfpyiz57wz9rkwif6n3k2n87waw46ad0h7h0pwhnar53cfihp98" }, "6.8": { "version": "6.8.12", From 8749852c4d102ea7854dc3684585f18989d380d1 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 30 Sep 2024 18:04:04 +0300 Subject: [PATCH 13/18] linux_6_1: 6.1.111 -> 6.1.112 (cherry picked from commit 7df132ae3e345ab8d41452e514e4548b1571b475) --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 528619abbe60..8ba27041edc8 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -4,8 +4,8 @@ "hash": "sha256:16zwvjcvgndvr0izx0qs2k7v85nvxwlx6j7y2yrdl3shalsdlmx2" }, "6.1": { - "version": "6.1.111", - "hash": "sha256:1c7d49kppv8xgqlsrfm1286mnvz8vcnbqqh6zgfca2s13px9hwn4" + "version": "6.1.112", + "hash": "sha256:094z3wfcxqx2rbi072i5frshpy6rdvk39aahwm9nc07vc8sxxn4b" }, "5.15": { "version": "5.15.167", From 46c63c1c7c5c01a07cd35caf19c3e9bdcf81d64b Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 30 Sep 2024 18:04:29 +0300 Subject: [PATCH 14/18] linux-rt_5_10: 5.10.224-rt116 -> 5.10.225-rt117 (cherry picked from commit 6290efed1503c0fe7095e612aded8a9476368a40) --- 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 26a97d456089..f0bf3d0b0c23 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.224-rt116"; # updated by ./update-rt.sh + version = "5.10.225-rt117"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -17,14 +17,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "06nivms93yjbddv3gl88m7bdrr0676nm3p12iqvsdfr4fg39kc0r"; + sha256 = "0770757ildcc0cs6alnb5cspg6ysg2wqly9z5q1vjf3mh0xbzmw5"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "0d7dcbpn0b0nqmcr35z2f5gsknn4hmqsr01n6j35amzv9fd45iwl"; + sha256 = "1c14gm4wzcbkhzgdm5lwq1as9is784yra7bc226bz3bqs3h7vmw2"; }; }; in [ rt-patch ] ++ kernelPatches; From 7701c2d4c9b4b62c2f8e2d4d4c884af0021fc2b3 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 30 Sep 2024 18:05:53 +0300 Subject: [PATCH 15/18] linux-rt_6_1: 6.1.108-rt40 -> 6.1.111-rt42 (cherry picked from commit 6c12dc70050611ec8d50343245d541336226c5c8) --- pkgs/os-specific/linux/kernel/linux-rt-6.1.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix b/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix index b0ea7956ad82..cbf3b473f7cf 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "6.1.108-rt40"; # updated by ./update-rt.sh + version = "6.1.111-rt42"; # 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/v6.x/linux-${kversion}.tar.xz"; - sha256 = "18lcd2b7ffwzqwqnmb948r7z95470bh7jiqps5nil8hfl24lwkiz"; + sha256 = "1c7d49kppv8xgqlsrfm1286mnvz8vcnbqqh6zgfca2s13px9hwn4"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "1ki0rn2cp3jkfna60sjlf2qn77fwpy0l2hdjk3i5xpmavir4mhdj"; + sha256 = "16yb962fkkvgppbx8glp5ph3h1jl2q1b4m2s8gsf3k9i9yim7v5c"; }; }; in [ rt-patch ] ++ kernelPatches; From e8a8a3d0d952237494d64d44e5dbe1056bff6882 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 30 Sep 2024 18:06:31 +0300 Subject: [PATCH 16/18] linux-rt_6_6: 6.6.49-rt41 -> 6.6.52-rt43 (cherry picked from commit 0ea0c2a7c6619b15e0dd9247bdd1d0cd62f28382) --- pkgs/os-specific/linux/kernel/linux-rt-6.6.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix b/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix index a7f317399076..e65e243e2b72 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "6.6.49-rt41"; # updated by ./update-rt.sh + version = "6.6.52-rt43"; # 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/v6.x/linux-${kversion}.tar.xz"; - sha256 = "1dyk5pr5g8s5ia7f1vnkid4jghi81pxvwlgn9rmw2n88nz1dlmic"; + sha256 = "1f5l6y7abscm01dr740fzvq8r756ar854n0i299smm4rhcsap48m"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "0aajxiwawk624y1r36l818m1ikgcl8szl6sapj70dcv95z9ach4i"; + sha256 = "0g33n9idc3lhbj5z637zm3bgqh601a05cl1s8ji8zbnfh971jcgh"; }; }; in [ rt-patch ] ++ kernelPatches; From 4aef69c73e059b61083172d925567e46fed00ca3 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 30 Sep 2024 18:28:46 +0300 Subject: [PATCH 17/18] linux/common-config: update for 6.12 - refactor Rust checks to prepare for enablement - enable DRM panic QR codes when Rust is enabled - enable I2C_DESIGNWARE_CORE explicitly for all the Bay Trail things - enable all the zram backends because they're separate options now and basically free - enable the new and returning module compression related options - enable scx and NFS local IO (cherry picked from commit 88746a794398da15142f91d42c829a4336616596) --- .../linux/kernel/common-config.nix | 38 +++++++++++++++---- 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index d9693a8a9624..0d599e5e5aee 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -32,6 +32,13 @@ let (stdenv.hostPlatform.isPower && stdenv.hostPlatform.is64bit) || (stdenv.hostPlatform.isMips && stdenv.hostPlatform.is64bit)); + forceRust = features.rust or false; + kernelSupportsRust = lib.versionAtLeast version "6.7"; + + # Currently not enabling Rust by default, as upstream requires rustc 1.81 + defaultRust = false; + withRust = (forceRust || defaultRust) && kernelSupportsRust; + options = { debug = { @@ -140,6 +147,7 @@ let # Required to bring up some Bay Trail devices properly I2C = yes; + I2C_DESIGNWARE_CORE = yes; I2C_DESIGNWARE_PLATFORM = yes; PMIC_OPREGION = whenAtLeast "5.10" yes; INTEL_SOC_PMIC = whenAtLeast "5.10" yes; @@ -487,14 +495,16 @@ let DRM_VC4_HDMI_CEC = yes; }; - # Enables Rust support in the Linux kernel. This is currently not enabled by default, because it occasionally requires - # patching the Linux kernel for the specific Rust toolchain in nixpkgs. These patches usually take a bit - # of time to appear and this would hold up Linux kernel and Rust toolchain updates. - # - # Once Rust in the kernel has more users, we can reconsider enabling it by default. - rust = optionalAttrs ((features.rust or false) && versionAtLeast version "6.7") { + # Enable Rust and features that depend on it + rust = lib.optionalAttrs withRust { RUST = yes; - GCC_PLUGINS = no; + + # These don't technically require Rust but we probably want to get some more testing + # on the whole DRM panic setup before shipping it by default. + DRM_PANIC = whenAtLeast "6.12" yes; + DRM_PANIC_SCREEN = whenAtLeast "6.12" (freeform "kmsg"); + + DRM_PANIC_SCREEN_QR_CODE = whenAtLeast "6.12" yes; }; sound = { @@ -633,6 +643,7 @@ let NFS_V4_1 = yes; # NFSv4.1 client support NFS_V4_2 = yes; NFS_V4_SECURITY_LABEL = yes; + NFS_LOCALIO = whenAtLeast "6.12" yes; CIFS_XATTR = yes; CIFS_POSIX = option yes; @@ -884,6 +895,12 @@ let ZRAM = module; ZRAM_WRITEBACK = option yes; ZRAM_MULTI_COMP = whenAtLeast "6.2" yes; + ZRAM_BACKEND_842 = whenAtLeast "6.12" yes; + ZRAM_BACKEND_DEFLATE = whenAtLeast "6.12" yes; + ZRAM_BACKEND_LZ4 = whenAtLeast "6.12" yes; + ZRAM_BACKEND_LZ4HC = whenAtLeast "6.12" yes; + ZRAM_BACKEND_LZO = whenAtLeast "6.12" yes; + ZRAM_BACKEND_ZSTD = whenAtLeast "6.12" yes; ZRAM_DEF_COMP_ZSTD = whenAtLeast "5.11" yes; ZSWAP = option yes; ZSWAP_COMPRESSOR_DEFAULT_ZSTD = whenAtLeast "5.7" (mkOptionDefault yes); @@ -962,7 +979,11 @@ let THRUSTMASTER_FF = yes; ZEROPLUS_FF = yes; - MODULE_COMPRESS = whenOlder "5.13" yes; + MODULE_COMPRESS = lib.mkMerge [ + (whenOlder "5.13" yes) + (whenAtLeast "6.12" yes) + ]; + MODULE_COMPRESS_ALL = whenAtLeast "6.12" yes; MODULE_COMPRESS_XZ = yes; SYSVIPC = yes; # System-V IPC @@ -1159,6 +1180,7 @@ let LIRC = yes; SCHED_CORE = whenAtLeast "5.14" yes; + SCHED_CLASS_EXT = whenAtLeast "6.12" yes; LRU_GEN = whenAtLeast "6.1" yes; LRU_GEN_ENABLED = whenAtLeast "6.1" yes; From 613e41d2eed840ce2f119f198e2e7b5b4a468909 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 29 Sep 2024 16:16:46 +0000 Subject: [PATCH 18/18] signal-desktop: 7.25.0 -> 7.26.0 (cherry picked from commit 43bbc78db704e059ceb533a651cf29300af180f0) --- .../instant-messengers/signal-desktop/signal-desktop.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix index 40666c4eca30..91b35e95441d 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix @@ -2,7 +2,7 @@ callPackage ./generic.nix { } rec { pname = "signal-desktop"; dir = "Signal"; - version = "7.25.0"; + version = "7.26.0"; url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - hash = "sha256-KcVCQkDSpI+eq2/wvPZxq6ILLQk3xe+wrKfbnJnTQTo="; + hash = "sha256-A9gTphQ7FQm1iCutrDxAD2wazihn+4ZafJrqdZ8Nahk="; }