From 267f564b1100248914d39d0d992653e5d4d4c9e6 Mon Sep 17 00:00:00 2001 From: Shadaj Laddad Date: Fri, 7 Apr 2023 14:50:16 -0700 Subject: [PATCH 1/6] openvscode-server: 1.76.2 -> 1.77.1 (cherry picked from commit 22b3ae923c587ab2cf1988242574d267b27e507d) --- pkgs/servers/openvscode-server/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/openvscode-server/default.nix b/pkgs/servers/openvscode-server/default.nix index 53dab24876e8..e2ec2f68dba7 100644 --- a/pkgs/servers/openvscode-server/default.nix +++ b/pkgs/servers/openvscode-server/default.nix @@ -27,13 +27,13 @@ let in stdenv.mkDerivation rec { pname = "openvscode-server"; - version = "1.76.2"; + version = "1.77.1"; src = fetchFromGitHub { owner = "gitpod-io"; repo = "openvscode-server"; rev = "openvscode-server-v${version}"; - sha256 = "IZyuMcu3f0jOflJsor/gMDoONgyOGU8Py+wRbRV38RU="; + sha256 = "i1AexC4EmVi7xSjdCfYmMIUU+CgKT48o03n39XQ0nVY="; }; yarnCache = stdenv.mkDerivation { @@ -56,7 +56,7 @@ in stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-zcT74h1bEPPwHCXPB2VoVDVelQlDW6FBO/b6SP1x8b4="; + outputHash = "sha256-Ca2qd9Q88BNUIT9avq1KiMwKcKkMX/NkU2q8DjGYQjg="; }; nativeBuildInputs = [ From bb4bbd04ac1837a1580e953c4dcad982690ee1e8 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 14 Apr 2023 15:53:02 +0200 Subject: [PATCH 2/6] =?UTF-8?q?jasmin-compiler:=202022.09.0=20=E2=86=92=20?= =?UTF-8?q?2022.09.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 67987accc0c29d632a8eb3329ad4bfc862bb4170) --- pkgs/development/compilers/jasmin-compiler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/jasmin-compiler/default.nix b/pkgs/development/compilers/jasmin-compiler/default.nix index bca3a166af39..7cd19ca85438 100644 --- a/pkgs/development/compilers/jasmin-compiler/default.nix +++ b/pkgs/development/compilers/jasmin-compiler/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jasmin-compiler"; - version = "2022.09.0"; + version = "2022.09.2"; src = fetchurl { url = "https://github.com/jasmin-lang/jasmin/releases/download/v${version}/jasmin-compiler-v${version}.tar.bz2"; - sha256 = "sha256-QiOnDhh1VI5c6AZ4/uwLdGBkP76HxN4cfnPJD4R2hlA="; + hash = "sha256-CGKaFR9Ax0O7BaW42DwYS4Air7zo5fOY2ExHkMGdtqo="; }; sourceRoot = "jasmin-compiler-v${version}/compiler"; From 365178118d2c40721bdfec07de8930453760532d Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Sun, 16 Apr 2023 22:51:44 +0200 Subject: [PATCH 3/6] mautrix-whatsapp: 0.8.3 -> 0.8.4 https://github.com/mautrix/whatsapp/releases/tag/v0.8.4 (cherry picked from commit 7a40725f9eb291bb11a46122d93faeb661e536d6) --- pkgs/servers/mautrix-whatsapp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix index 06821636099f..6e537b88ec7f 100644 --- a/pkgs/servers/mautrix-whatsapp/default.nix +++ b/pkgs/servers/mautrix-whatsapp/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "mautrix-whatsapp"; - version = "0.8.3"; + version = "0.8.4"; src = fetchFromGitHub { owner = "mautrix"; repo = "whatsapp"; rev = "v${version}"; - hash = "sha256-rSyKKWg9PiAZAdmUfWWxU4ZXGHP+LR1kcDXMbkB3wYA="; + hash = "sha256-4dOkSnurg2Sk36Z2WNjPaO092IiRlzc9oWM6sQ+wUwM="; }; buildInputs = [ olm ]; - vendorSha256 = "sha256-eHY6YBPDA2uJyhvB/3bd+W2PEfGjyx3BEAlbJvVV0Yo="; + vendorSha256 = "sha256-48C9aaOe148emSsxzfKFKtnXyC39IFO8Ge7d+rIhDac="; doCheck = false; From 61152fe32ec37c604e42193aaa978873c30ef1a4 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 17 Apr 2023 10:33:58 +0200 Subject: [PATCH 4/6] php81: 8.1.17 -> 8.1.18 changelog: https://www.php.net/ChangeLog-8.php#8.1.18 (cherry picked from commit 9b5533a3be9057f6d1c0336c5ddb9e0be89c1f3d) --- pkgs/development/interpreters/php/8.1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/8.1.nix b/pkgs/development/interpreters/php/8.1.nix index 95edce456c9b..262ef388032b 100644 --- a/pkgs/development/interpreters/php/8.1.nix +++ b/pkgs/development/interpreters/php/8.1.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "8.1.17"; - hash = "sha256-9Pspig6wkflE7OusV7dtqudoqXDC9RYQpask802MDK8="; + version = "8.1.18"; + hash = "sha256-0qww1rV0/KWU/gzAHAaT4jWFsnRD40KwqrBydM3kQW4="; }); in From b740cc08c23f3c52398a9c976e4f2688657bb89c Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 17 Apr 2023 10:34:34 +0200 Subject: [PATCH 5/6] php82: 8.2.4 -> 8.2.5 changelog: https://www.php.net/ChangeLog-8.php#8.2.5 (cherry picked from commit b384624244ce0dd49b9c67baf6dd2d5458f82d64) --- pkgs/development/interpreters/php/8.2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/8.2.nix b/pkgs/development/interpreters/php/8.2.nix index 3b990e61bf5b..702dc7566a49 100644 --- a/pkgs/development/interpreters/php/8.2.nix +++ b/pkgs/development/interpreters/php/8.2.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "8.2.4"; - hash = "sha256-eRhvlL1RDbhuMeU13USCd6Hrkqh4eDA6Hq1EYC2LEZc="; + version = "8.2.5"; + hash = "sha256-5agGY8yk9gRK2GpIl5gUfHrwN+ypb2zTV6s20oy2N1c="; }); in From fd227b430125361e62d732952babda71883dfa6d Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Thu, 13 Apr 2023 20:33:39 +0200 Subject: [PATCH 6/6] doc: Fix the function locations always pointing to master Instead of revisions as they should. This is (most-likely) caused by a simple typo, because Hydra is where the revision should come from, but it doesn't set `.revision` as the attribute, but rather `.rev`! (cherry picked from commit 019fd455371037ddb4005152b3059b6404f5c73c) --- doc/doc-support/lib-function-locations.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/doc-support/lib-function-locations.nix b/doc/doc-support/lib-function-locations.nix index 68edd2709854..53a96bc2659e 100644 --- a/doc/doc-support/lib-function-locations.nix +++ b/doc/doc-support/lib-function-locations.nix @@ -1,6 +1,6 @@ { pkgs ? (import ./.. { }), nixpkgs ? { }}: let - revision = pkgs.lib.trivial.revisionWithDefault (nixpkgs.revision or "master"); + revision = pkgs.lib.trivial.revisionWithDefault (nixpkgs.rev or "master"); libDefPos = set: builtins.map