From 57c55b412a9b14639c731919f64ea532c67072b1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 13 May 2024 03:44:07 +0000 Subject: [PATCH 1/8] microsoft-edge: 124.0.2478.80 -> 124.0.2478.97 (cherry picked from commit 428378f6fc5c3640e9b6a37a7169783ee47dcbca) --- .../networking/browsers/microsoft-edge/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/microsoft-edge/default.nix b/pkgs/applications/networking/browsers/microsoft-edge/default.nix index 147e1709d41b..8b9574916ce0 100644 --- a/pkgs/applications/networking/browsers/microsoft-edge/default.nix +++ b/pkgs/applications/networking/browsers/microsoft-edge/default.nix @@ -1,20 +1,20 @@ { beta = import ./browser.nix { channel = "beta"; - version = "125.0.2535.13"; + version = "125.0.2535.37"; revision = "1"; - hash = "sha256-vO7crYX/QW+S1fjT37JtyRJyziauG+H3LWOasX4VaKM="; + hash = "sha256-/fZcFIVj4stIxim2UYsxA5rNkyGf/i3eDf25npsdDi4="; }; dev = import ./browser.nix { channel = "dev"; - version = "126.0.2552.0"; + version = "126.0.2566.1"; revision = "1"; - hash = "sha256-TQHTqCweP0mEkEYRxlU7YtYS6Y6ooZ4V6peCsVvcIjg="; + hash = "sha256-PePosWGdkLm5OK82YP9LQbvVz5de8KL06I6rv0TKP3A="; }; stable = import ./browser.nix { channel = "stable"; - version = "124.0.2478.80"; + version = "124.0.2478.97"; revision = "1"; - hash = "sha256-p+t12VcwxSDuyZj3VfzEJ6m0rGoVC7smeyHoODttwQU="; + hash = "sha256-hdCtHWOEez3VTw8hTRiitURiu0MpFTbnc60biym795k="; }; } From afb9014937e9bfb05f00f5b733152304bb19f435 Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Sat, 11 May 2024 11:59:58 +0530 Subject: [PATCH 2/8] google-chrome: add update-script (cherry picked from commit d95e9bf3a61395f00b18379d9fb6388d3e6645f9) --- pkgs/by-name/go/google-chrome/package.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix index d31d5bafe09b..ff54ecddd68e 100644 --- a/pkgs/by-name/go/google-chrome/package.nix +++ b/pkgs/by-name/go/google-chrome/package.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, patchelf, makeWrapper, fetchurl +{ lib, stdenv, patchelf, makeWrapper, fetchurl, writeScript # Linked dynamic libraries. , glib, fontconfig, freetype, pango, cairo, libX11, libXi, atk, nss, nspr @@ -142,6 +142,17 @@ in stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; + passthru = { + updateScript = writeScript "update-google-chrome.sh" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl jq common-updater-scripts + url="https://versionhistory.googleapis.com/v1/chrome/platforms/linux/channels/stable/versions/all/releases" + response=$(curl --silent $url) + version=$(jq ".releases[0].version" --raw-output <<< "$response") + update-source-version ${finalAttrs.pname} "$version" --ignore-same-hash + ''; + }; + meta = { description = "A freeware web browser developed by Google"; homepage = "https://www.google.com/chrome/browser/"; From 6fbc4e0bfac3f51779f3bc067fa956c953fed179 Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Wed, 15 May 2024 12:47:11 +0100 Subject: [PATCH 3/8] google-chrome: increase safety of update-script (cherry picked from commit 751f923d7a4354661a5a23411fa6c3a7e498154b) --- pkgs/by-name/go/google-chrome/package.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix index ff54ecddd68e..f0ad77a2bfcf 100644 --- a/pkgs/by-name/go/google-chrome/package.nix +++ b/pkgs/by-name/go/google-chrome/package.nix @@ -146,10 +146,11 @@ in stdenv.mkDerivation (finalAttrs: { updateScript = writeScript "update-google-chrome.sh" '' #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl jq common-updater-scripts + set -euo pipefail url="https://versionhistory.googleapis.com/v1/chrome/platforms/linux/channels/stable/versions/all/releases" - response=$(curl --silent $url) - version=$(jq ".releases[0].version" --raw-output <<< "$response") - update-source-version ${finalAttrs.pname} "$version" --ignore-same-hash + response="$(curl --silent --fail $url)" + version="$(jq ".releases[0].version" --raw-output <<< $response)" + update-source-version ${finalAttrs.pname} $version --ignore-same-hash ''; }; From 4e9eb5ff81c19f75af26cce887b9014208dac0ab Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Wed, 15 May 2024 13:53:30 +0100 Subject: [PATCH 4/8] google-chrome: 124.0.6367.201 -> 125.0.6422.60 (cherry picked from commit b85faff72369380f27fb97d2e27f4075954ec3ca) --- pkgs/by-name/go/google-chrome/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix index f0ad77a2bfcf..bd0a31aadf3b 100644 --- a/pkgs/by-name/go/google-chrome/package.nix +++ b/pkgs/by-name/go/google-chrome/package.nix @@ -64,11 +64,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "google-chrome"; - version = "124.0.6367.201"; + version = "125.0.6422.60"; src = fetchurl { url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb"; - hash = "sha256-RvQdpDmWRcsASh1b8M0Zg+AvZprE5qhi14shfo0WlfE="; + hash = "sha256-Q0QMPthJLVquJp7fm6QN+lDb0quZsT7hv6KRXfdBMl4="; }; nativeBuildInputs = [ patchelf makeWrapper ]; From 835665c3e2a1408a2efb4d08aac1441d387d02ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 16 May 2024 13:50:02 +0200 Subject: [PATCH 5/8] Revert "[Backport release-23.11] docker_24: 24.0.5 -> 24.0.9" --- .../applications/virtualization/docker/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 88e1a10b7170..561066bfa12a 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -294,15 +294,15 @@ rec { }; docker_24 = callPackage dockerGen rec { - version = "24.0.9"; + version = "24.0.5"; cliRev = "v${version}"; - cliHash = "sha256-nXIZtE0X1OoQT908IGuRhVHb0tiLbqQLP0Md3YWt0/Q="; + cliHash = "sha256-u1quVGTx/p8BDyRn33vYyyuE5BOhWMnGQ5uVX0PZ5mg="; mobyRev = "v${version}"; - mobyHash = "sha256-KRS99heyMAPBnjjr7If8TOlJf6v6866S7J3YGkOhFiA="; - runcRev = "v1.1.12"; - runcHash = "sha256-N77CU5XiGYIdwQNPFyluXjseTeaYuNJ//OsEUS0g/v0="; - containerdRev = "v1.7.13"; - containerdHash = "sha256-y3CYDZbA2QjIn1vyq/p1F1pAVxQHi/0a6hGWZCRWzyk="; + mobyHash = "sha256-JQjRz1fHZlQRkNw/R8WWLV8caN3/U3mrKKQXbZt2crU="; + runcRev = "v1.1.8"; + runcHash = "sha256-rDJYEc64KW4Qa3Eg2oUjJqIKrg6THb5hxQFFbvb9Zp4="; + containerdRev = "v1.7.1"; + containerdHash = "sha256-WwedtcsrDQwMQcKFO5nnPiHyGJpl5hXZlmpbBe1/ftY="; tiniRev = "v0.19.0"; tiniHash = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI="; }; From 72371738ccc05d9f766873bb000c5fa81842e75e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 May 2024 17:05:30 +0000 Subject: [PATCH 6/8] libewf-legacy: 20140814 -> 20140816 (cherry picked from commit 5fab9b7e2acb7ca125c588e19b336e4986aee157) --- pkgs/by-name/li/libewf-legacy/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libewf-legacy/package.nix b/pkgs/by-name/li/libewf-legacy/package.nix index f6505afdacec..536a28eceebe 100644 --- a/pkgs/by-name/li/libewf-legacy/package.nix +++ b/pkgs/by-name/li/libewf-legacy/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "libewf-legacy"; - version = "20140814"; + version = "20140816"; src = fetchurl { url = "https://github.com/libyal/libewf-legacy/releases/download/${finalAttrs.version}/libewf-${finalAttrs.version}.tar.gz"; - hash = "sha256-OM3QXwnaIDeo66UNjzmu6to53SxgCMn/rE9VTPlX5BQ="; + hash = "sha256-ay0Hj7OGFnm6g5Qv6lHp5gKcN+wuoMN/V0QlbW9wJak="; }; nativeBuildInputs = [ pkg-config ]; From 7481b7298e16c9377271b16c310383475a8b5f77 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 15 May 2024 17:20:54 +0200 Subject: [PATCH 7/8] strace: 6.8 -> 6.9 ChangeLog: https://github.com/strace/strace/releases/tag/v6.9 (cherry picked from commit c2bc33647f4c4b856ee28589322b7f913050f1f8) --- pkgs/development/tools/misc/strace/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index 3cae7fc017d4..e1cd72ea683a 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "strace"; - version = "6.8"; + version = "6.9"; src = fetchurl { url = "https://strace.io/files/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-umlQqWgkzfk6WE+gTwpzOJbSprxfCtn/5QXZtB6XAUk="; + sha256 = "sha256-2hiemQqC48o6WkYxAS9+z9SJ2rRZhU2C2Mr2qGXBNWo="; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; From 8847096d0c9ec96e70e186aa65108024acae2ffc Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Wed, 15 May 2024 21:32:56 +0300 Subject: [PATCH 8/8] raycast: 1.73.0 -> 1.74.0 Changelog: https://www.raycast.com/changelog/1-74-0 (cherry picked from commit 525339a9e4f87b21cb2e7f6e5579e5c5fce17204) --- pkgs/os-specific/darwin/raycast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/raycast/default.nix b/pkgs/os-specific/darwin/raycast/default.nix index b985668b21dc..da73099da861 100644 --- a/pkgs/os-specific/darwin/raycast/default.nix +++ b/pkgs/os-specific/darwin/raycast/default.nix @@ -10,12 +10,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "raycast"; - version = "1.73.0"; + version = "1.74.0"; src = fetchurl { name = "Raycast.dmg"; url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=universal"; - hash = "sha256-TiHFuU54+IDBrdIMSI397ysm8uOb2/oRhSyoy+5yzTw="; + hash = "sha256-aPpxPjEhy1uLekHMLyI18mlSozffMA+HB1OdqpULVnw="; }; dontPatch = true;