From 3196b4ae7bcfa59751e0e60d8afba4adbdb5d34d Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 2 Oct 2024 16:02:43 +0200 Subject: [PATCH 01/19] katawa-shoujo: Fetch from archive.org Download speed has been unbearable since the migration to fhs.sh and their CDN. Go via archive.org instead. Upstream CDN is 30 kB/s for me, 300 kB/s for someone else I asked. archive.org lets me pull at more than 300 kB/s, sometimes up to 1 or 2 MB/s. Not lightning-fast either, but better. (cherry picked from commit 6476f11bc66b29dbc1d26cce5158501c6966a5b7) --- pkgs/games/katawa-shoujo/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/games/katawa-shoujo/default.nix b/pkgs/games/katawa-shoujo/default.nix index 8e24966fc9ae..18aa00d0e16e 100644 --- a/pkgs/games/katawa-shoujo/default.nix +++ b/pkgs/games/katawa-shoujo/default.nix @@ -31,11 +31,13 @@ let stdenv = stdenvNoCC; srcDetails = rec { x86_64-linux = { + archiveDate = "20240825224413"; urlSuffix = "%5blinux-x86%5d%5b18161880%5d.tar.bz2"; hash = "sha256-7FoFz88dWYHs2/pxkEwnmiFeeb3+slayrWknEJoAB9o="; }; i686-linux = x86_64-linux; x86_64-darwin = { + archiveDate = "20240825224411"; urlSuffix = "%5bmac%5d%5b1DFC84A6%5d.dmg"; hash = "sha256-Sc5BAlpJsffjcNrZ8+VU3n7G10DoqDKQn/leHDW32Y8="; }; @@ -46,7 +48,7 @@ stdenv.mkDerivation rec { version = "1.3.1"; src = fetchurl { - url = "https://cdn.fhs.sh/ks/bin/gold_${version}/%5b4ls%5d_katawa_shoujo_${version}-${srcDetails.urlSuffix}"; + url = "https://web.archive.org/web/${srcDetails.archiveDate}/https://cdn.fhs.sh/ks/bin/gold_${version}/%5b4ls%5d_katawa_shoujo_${version}-${srcDetails.urlSuffix}"; inherit (srcDetails) hash; }; From d025af54733adfcddf8567b75e8169000b567161 Mon Sep 17 00:00:00 2001 From: Connor Glosser <49202382+rayhem@users.noreply.github.com> Date: Thu, 26 Sep 2024 20:11:32 -0400 Subject: [PATCH 02/19] maintainers: add rayhem (cherry picked from commit c2862ede74e9113d4ed6a922b6402fccab0f4d21) --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e4addbb23e4c..d443f3aff94c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -16458,6 +16458,12 @@ githubId = 145816; name = "David McKay"; }; + rayhem = { + email = "glosser1@gmail.com"; + github = "rayhem"; + githubId = 49202382; + name = "Connor Glosser"; + }; raylas = { email = "r@raymond.sh"; github = "raylas"; From db55be6e21e0287d3b3f90073a4d29e1c172bf15 Mon Sep 17 00:00:00 2001 From: Connor Glosser <49202382+rayhem@users.noreply.github.com> Date: Thu, 26 Sep 2024 20:12:38 -0400 Subject: [PATCH 03/19] python312Packages.biothings-client: init at 0.3.1 Intended for use with mygene library (cherry picked from commit 0667d782323fcfb5bcf8add4f81c35a73810e61e) --- .../biothings-client/default.nix | 40 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/python-modules/biothings-client/default.nix diff --git a/pkgs/development/python-modules/biothings-client/default.nix b/pkgs/development/python-modules/biothings-client/default.nix new file mode 100644 index 000000000000..67334498240c --- /dev/null +++ b/pkgs/development/python-modules/biothings-client/default.nix @@ -0,0 +1,40 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + pytestCheckHook, + requests, +}: +buildPythonPackage rec { + pname = "biothings-client"; + version = "0.3.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "biothings"; + repo = "biothings_client.py"; + rev = "v${version}"; + hash = "sha256-rCpzBX2H+7R8ulnJgtVlBA45ASa4DaY5jQ1bO2+bAC8="; + }; + + build-system = [ setuptools ]; + dependencies = [ requests ]; + pythonImportsCheck = [ "biothings_client" ]; + nativeCheckInputs = [ pytestCheckHook ]; + + pytestFlagsArray = [ + # All other tests make network requests to exercise the API + "tests/gene.py::TestGeneClient::test_http" + "tests/test.py::TestBiothingsClient::test_generate_settings_from_url" + "tests/variant.py::TestVariantClient::test_format_hgvs" + ]; + + meta = { + changelog = "https://github.com/biothings/biothings_client.py/blob/v${version}/CHANGES.txt"; + description = "Wrapper to access Biothings.api-based backend services"; + homepage = "https://github.com/biothings/biothings_client.py"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ rayhem ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5ba7d0a8059f..af35a0f902c4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1551,6 +1551,8 @@ self: super: with self; { biopython = callPackage ../development/python-modules/biopython { }; + biothings-client = callPackage ../development/python-modules/biothings-client { }; + biplist = callPackage ../development/python-modules/biplist { }; bip-utils = callPackage ../development/python-modules/bip-utils { }; From c78221a3eb850c564be1d44cdc9c05bc097ee87e Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Tue, 26 Mar 2024 20:48:16 -0400 Subject: [PATCH 04/19] python3Packages.dbf: Fix not running hooks in checkPhase (cherry picked from commit 923d79c8e239033b6cd78a344e46e577e2cb00bf) --- pkgs/development/python-modules/dbf/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/dbf/default.nix b/pkgs/development/python-modules/dbf/default.nix index ebe64fa28a50..10c448335b8f 100644 --- a/pkgs/development/python-modules/dbf/default.nix +++ b/pkgs/development/python-modules/dbf/default.nix @@ -22,7 +22,9 @@ buildPythonPackage rec { propagatedBuildInputs = [ aenum ]; checkPhase = '' + runHook preCheck ${python.interpreter} -m dbf.test + runHook postCheck ''; pythonImportsCheck = [ "dbf" ]; From d6ca13034eca1dd010f304461bf363998c425b8b Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Fri, 22 Mar 2024 10:44:26 -0400 Subject: [PATCH 05/19] python3Packages.dbf: Workaround broken build on Darwin Skip test that fails on case-insensitive filesystems pending an upstream fix (see issue linked in code). (cherry picked from commit 4fdfab04387758a0e91e54073c5f5536883045ca) --- pkgs/development/python-modules/dbf/darwin.patch | 12 ++++++++++++ pkgs/development/python-modules/dbf/default.nix | 3 +++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/python-modules/dbf/darwin.patch diff --git a/pkgs/development/python-modules/dbf/darwin.patch b/pkgs/development/python-modules/dbf/darwin.patch new file mode 100644 index 000000000000..92c96c7f1c98 --- /dev/null +++ b/pkgs/development/python-modules/dbf/darwin.patch @@ -0,0 +1,12 @@ +diff --git a/dbf/test.py b/dbf/test.py +index 117f611..34a9507 100755 +--- a/dbf/test.py ++++ b/dbf/test.py +@@ -4814,6 +4814,7 @@ def test_index_search(self): + self.assertEqual(sorted.index_search('jul', partial=True), 9) + self.assertTrue(sorted.index_search('jul', partial=True)) + ++ @unittest.skipIf(sys.platform == 'darwin', 'fails on case-insensitive filesystems') + def test_mismatched_extensions(self): + old_memo_name = self.dbf_table._meta.memoname + new_memo_name = old_memo_name[:-3] + 'Dbt' diff --git a/pkgs/development/python-modules/dbf/default.nix b/pkgs/development/python-modules/dbf/default.nix index 10c448335b8f..f6bb0282e8c8 100644 --- a/pkgs/development/python-modules/dbf/default.nix +++ b/pkgs/development/python-modules/dbf/default.nix @@ -19,6 +19,9 @@ buildPythonPackage rec { hash = "sha256-MFEi1U0RNvrfDtV4HpvPgKTCibAh76z7Gnmj32IubYw="; }; + # Workaround for https://github.com/ethanfurman/dbf/issues/48 + patches = lib.optional python.stdenv.isDarwin ./darwin.patch; + propagatedBuildInputs = [ aenum ]; checkPhase = '' From 04e7fe78c0c76c1032d6653b22ff9bcd5be8d55a Mon Sep 17 00:00:00 2001 From: Artturin Date: Mon, 30 Sep 2024 18:01:28 +0300 Subject: [PATCH 06/19] lib.systems.examples: Fix deprecated attr `For android 'sdkVer' has been renamed to 'androidSdkVersion'` While doing the above rename I forgot to consider if there were still darwin platforms in `lib.systems.examples` using `sdkVer` These still fail eval, but that happened before the renaming too. `error: Unsupported sdk: 14.3` (cherry picked from commit aed1142d79b080aa7ace6c458ae88a986275561e) --- lib/systems/examples.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index ae76569ad859..f942ab9f7153 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -256,7 +256,7 @@ rec { iphone64 = { config = "aarch64-apple-ios"; # config = "aarch64-apple-darwin14"; - sdkVer = "14.3"; + darwinSdkVersion = "14.3"; xcodeVer = "12.3"; xcodePlatform = "iPhoneOS"; useiOSPrebuilt = true; @@ -265,7 +265,7 @@ rec { iphone32 = { config = "armv7a-apple-ios"; # config = "arm-apple-darwin10"; - sdkVer = "14.3"; + darwinSdkVersion = "14.3"; xcodeVer = "12.3"; xcodePlatform = "iPhoneOS"; useiOSPrebuilt = true; @@ -274,7 +274,7 @@ rec { iphone64-simulator = { config = "x86_64-apple-ios"; # config = "x86_64-apple-darwin14"; - sdkVer = "14.3"; + darwinSdkVersion = "14.3"; xcodeVer = "12.3"; xcodePlatform = "iPhoneSimulator"; darwinPlatform = "ios-simulator"; @@ -284,7 +284,7 @@ rec { iphone32-simulator = { config = "i686-apple-ios"; # config = "i386-apple-darwin11"; - sdkVer = "14.3"; + darwinSdkVersion = "14.3"; xcodeVer = "12.3"; xcodePlatform = "iPhoneSimulator"; darwinPlatform = "ios-simulator"; From 574d2ff60fa2df2390b82b979a9787d8b71457bd Mon Sep 17 00:00:00 2001 From: Ali Afsharzadeh Date: Mon, 2 Sep 2024 08:29:18 +0330 Subject: [PATCH 07/19] docker_27: 27.1.1 -> 27.2.0 (cherry picked from commit 755657b2b4f81995ef049b677c745f92bd435c66) --- pkgs/applications/virtualization/docker/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 505e66693f4b..53076b981486 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -330,15 +330,15 @@ rec { }; docker_27 = callPackage dockerGen rec { - version = "27.1.1"; + version = "27.2.0"; cliRev = "v${version}"; - cliHash = "sha256-r9figEMYHHSbMYVFiw7GUMzjZBhlF+jyZqKixyCpoQ0="; + cliHash = "sha256-Fa1EUwJjxh5jzhQJ4tllDZBfB7KACHDEe9ETVzMfUNY="; mobyRev = "v${version}"; - mobyHash = "sha256-LuCEdQQ3eWt8VyzmWkQTxlxTok9h/UlACTVls5LcI7g="; + mobyHash = "sha256-grxKlsbhxumQZNOyM96aURSiVFE1Fe5NFxUoPzFX/Qk="; runcRev = "v1.1.13"; runcHash = "sha256-RQsM8Q7HogDVGbNpen3wxXNGR9lfqmNhkXTRoC+LBk8="; - containerdRev = "v1.7.20"; - containerdHash = "sha256-Q9lTzz+G5PSoChy8MZtbOpO81AyNWXC+CgGkdOg14uY="; + containerdRev = "v1.7.21"; + containerdHash = "sha256-cL1RKFg+B2gTPMg963DKup5BCLLgF9t9VZn2WlmmWPI="; tiniRev = "v0.19.0"; tiniHash = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI="; }; From b493b0e7ccbd4718a0dce41ab1c47723e97d88ac Mon Sep 17 00:00:00 2001 From: Parsifa1 Date: Tue, 24 Sep 2024 11:23:23 +0000 Subject: [PATCH 08/19] docker_27: 27.2.0 -> 27.3.0 (cherry picked from commit aae4960f6bd1fd2e165ef8a92588bbd466da1484) --- .../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 53076b981486..566b8103e862 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -330,15 +330,15 @@ rec { }; docker_27 = callPackage dockerGen rec { - version = "27.2.0"; + version = "27.3.0"; cliRev = "v${version}"; - cliHash = "sha256-Fa1EUwJjxh5jzhQJ4tllDZBfB7KACHDEe9ETVzMfUNY="; + cliHash = "sha256-1z2MmWq+HD2fhpZqXu0G7oBL3Mc0NN/fR69aMWRelns="; mobyRev = "v${version}"; - mobyHash = "sha256-grxKlsbhxumQZNOyM96aURSiVFE1Fe5NFxUoPzFX/Qk="; - runcRev = "v1.1.13"; - runcHash = "sha256-RQsM8Q7HogDVGbNpen3wxXNGR9lfqmNhkXTRoC+LBk8="; - containerdRev = "v1.7.21"; - containerdHash = "sha256-cL1RKFg+B2gTPMg963DKup5BCLLgF9t9VZn2WlmmWPI="; + mobyHash = "sha256-AKl06k2ePWOFhL3oH086HcLLYs2Da+wLOcGjGnQ0SXE="; + runcRev = "v1.1.14"; + runcHash = "sha256-7PYbSZqCQLTaeFppuNz5mxDlwEyLkA5zpdMhWy1tWmc="; + containerdRev = "v1.7.22"; + containerdHash = "sha256-8IHBKai4PvvTuHPDTgx9wFEBzz4MM7Mwo8Q/bzFRzfk="; tiniRev = "v0.19.0"; tiniHash = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI="; }; From 7f56f219871bc38f4516d1d15ffb5cc1a930fe91 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 14 Oct 2024 04:35:04 +0000 Subject: [PATCH 09/19] docker: 27.3.0 -> 27.3.1 (cherry picked from commit e55b3cf7583630f6e8483a418e9e339e0b5104c4) --- pkgs/applications/virtualization/docker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 566b8103e862..181d595f2e94 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -330,9 +330,9 @@ rec { }; docker_27 = callPackage dockerGen rec { - version = "27.3.0"; + version = "27.3.1"; cliRev = "v${version}"; - cliHash = "sha256-1z2MmWq+HD2fhpZqXu0G7oBL3Mc0NN/fR69aMWRelns="; + cliHash = "sha256-Iurud1BwswGZCFgJ04/wl1U9AKcsXDmzFXLFCrjfc0Y="; mobyRev = "v${version}"; mobyHash = "sha256-AKl06k2ePWOFhL3oH086HcLLYs2Da+wLOcGjGnQ0SXE="; runcRev = "v1.1.14"; From e63a72f93e5cc68fc387bb7b463336bb7cebdbee Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Mon, 23 Sep 2024 16:18:12 +0300 Subject: [PATCH 10/19] stats: 2.11.7 -> 2.11.11 Changelog: https://github.com/exelban/stats/releases/tag/v2.11.11 Diff: https://github.com/exelban/stats/compare/v2.11.7...v2.11.11 (cherry picked from commit cbb3d6d9b716757243eb78bfdf943bfa7762d881) --- pkgs/by-name/st/stats/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/st/stats/package.nix b/pkgs/by-name/st/stats/package.nix index a476ce5cfa39..69c14a45abcd 100644 --- a/pkgs/by-name/st/stats/package.nix +++ b/pkgs/by-name/st/stats/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "stats"; - version = "2.11.7"; + version = "2.11.11"; src = fetchurl { url = "https://github.com/exelban/stats/releases/download/v${finalAttrs.version}/Stats.dmg"; - hash = "sha256-UppO7Cky+9xYg292t/78GPJ822kJ0RMG9yvetxRMVsU="; + hash = "sha256-6USopfRy+ffxXYNAp14RcO/uKZa1yfnz2S3RP8HmCWw="; }; sourceRoot = "."; From b44db269539a82b1abb0b8a6cb868086f1193b16 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Sun, 13 Oct 2024 20:38:55 +0300 Subject: [PATCH 11/19] stats: 2.11.11 -> 2.11.14 Changelog: https://github.com/exelban/stats/releases/tag/v2.11.14 Diff: https://github.com/exelban/stats/compare/v2.11.11...v2.11.14 (cherry picked from commit 656cbc4679c7725760c0175442e0749bba568025) --- pkgs/by-name/st/stats/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/st/stats/package.nix b/pkgs/by-name/st/stats/package.nix index 69c14a45abcd..7580d7977fe5 100644 --- a/pkgs/by-name/st/stats/package.nix +++ b/pkgs/by-name/st/stats/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "stats"; - version = "2.11.11"; + version = "2.11.14"; src = fetchurl { url = "https://github.com/exelban/stats/releases/download/v${finalAttrs.version}/Stats.dmg"; - hash = "sha256-6USopfRy+ffxXYNAp14RcO/uKZa1yfnz2S3RP8HmCWw="; + hash = "sha256-JljFHlMcc8kfjGTdGAOP4ot+FqVy0yAJ1kxVO0TawHU="; }; sourceRoot = "."; From 047ebe13873f09fac2e42d7c6a2c77c96834292b Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Sun, 13 Oct 2024 20:41:24 +0300 Subject: [PATCH 12/19] stats: format `meta.maintainers` (cherry picked from commit a96c2506cf63c6d526339a2c71be664d3dfcea5f) --- pkgs/by-name/st/stats/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/st/stats/package.nix b/pkgs/by-name/st/stats/package.nix index 7580d7977fe5..1007df42f5b5 100644 --- a/pkgs/by-name/st/stats/package.nix +++ b/pkgs/by-name/st/stats/package.nix @@ -37,7 +37,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ donteatoreo emilytrau - Enzime ]; platforms = lib.platforms.darwin; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; From 8548b4d77680d8d8598cb3e1629917a24a89c18c Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Sun, 13 Oct 2024 20:46:14 +0300 Subject: [PATCH 13/19] stats: quote paths Co-authored-by: Ulli Kehrle (cherry picked from commit 272bb210c3e9cdf953ec66a878359f97d3cc59a5) --- pkgs/by-name/st/stats/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/st/stats/package.nix b/pkgs/by-name/st/stats/package.nix index 1007df42f5b5..46a148ea563b 100644 --- a/pkgs/by-name/st/stats/package.nix +++ b/pkgs/by-name/st/stats/package.nix @@ -22,8 +22,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall - mkdir -p $out/Applications - cp -r *.app $out/Applications + mkdir -p "$out/Applications" + cp -r *.app "$out/Applications" runHook postInstall ''; From 2e65e24eaee86b8eabdcbbade4a2d5d36c1e8285 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Fri, 18 Oct 2024 23:44:56 -0400 Subject: [PATCH 14/19] patroni: 3.3.3 -> 3.3.4 https://github.com/patroni/patroni/blob/v3.3.4/docs/releases.rst#version-334 --- pkgs/servers/sql/patroni/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/patroni/default.nix b/pkgs/servers/sql/patroni/default.nix index 369b3cc836b6..c9d58400dd1b 100644 --- a/pkgs/servers/sql/patroni/default.nix +++ b/pkgs/servers/sql/patroni/default.nix @@ -6,13 +6,13 @@ pythonPackages.buildPythonApplication rec { pname = "patroni"; - version = "3.3.3"; + version = "3.3.4"; src = fetchFromGitHub { owner = "zalando"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-LIdW62LLEmsQZJMbInb1vbKaKgEEBBU1HGyLLNitjjg="; + sha256 = "sha256-ETPHpWXWjdHCRbWW+z6/mVJ42uHvwCwsFKskbkj76wg="; }; propagatedBuildInputs = with pythonPackages; [ From bfcbc85a77c219b4c905dce97a28dd7b48136cd5 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sat, 19 Oct 2024 13:54:49 +0200 Subject: [PATCH 15/19] percona-server_8_{0,4}: fix tests not being found (cherry picked from commit 6139a8102e99f4153648bbb26d0c01c9ab8809cc) --- pkgs/servers/sql/percona-server/8_0.nix | 2 +- pkgs/servers/sql/percona-server/8_4.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/percona-server/8_0.nix b/pkgs/servers/sql/percona-server/8_0.nix index 8ac5d69d7d89..ffb355c54925 100644 --- a/pkgs/servers/sql/percona-server/8_0.nix +++ b/pkgs/servers/sql/percona-server/8_0.nix @@ -182,7 +182,7 @@ stdenv.mkDerivation (finalAttrs: { connector-c = finalAttrs.finalPackage; server = finalAttrs.finalPackage; mysqlVersion = lib.versions.majorMinor finalAttrs.version; - tests = nixosTests.mysql.percona-server_lts; + tests.percona-server = nixosTests.mysql.percona-server_8_0; }; meta = with lib; { diff --git a/pkgs/servers/sql/percona-server/8_4.nix b/pkgs/servers/sql/percona-server/8_4.nix index e2a1cb1c7e2d..39fa97a6a6e4 100644 --- a/pkgs/servers/sql/percona-server/8_4.nix +++ b/pkgs/servers/sql/percona-server/8_4.nix @@ -204,7 +204,7 @@ stdenv.mkDerivation (finalAttrs: { connector-c = finalAttrs.finalPackage; server = finalAttrs.finalPackage; mysqlVersion = lib.versions.majorMinor finalAttrs.version; - tests = nixosTests.mysql.percona-server_innovation; + tests.percona-server = nixosTests.mysql.percona-server_8_4; }; meta = with lib; { From e270409cf8f37be21b10251669a4540c1390b438 Mon Sep 17 00:00:00 2001 From: networkException Date: Sun, 20 Oct 2024 20:04:44 +0200 Subject: [PATCH 16/19] ungoogled-chromium: 129.0.6668.100-1 -> 130.0.6723.58-1 https://chromereleases.googleblog.com/2024/10/stable-channel-update-for-desktop_15.html This update includes 17 security fixes. CVEs: CVE-2024-9954 CVE-2024-9955 CVE-2024-9956 CVE-2024-9957 CVE-2024-9958 CVE-2024-9959 CVE-2024-9960 CVE-2024-9961 CVE-2024-9962 CVE-2024-9963 CVE-2024-9964 CVE-2024-9965 CVE-2024-9966 Co-authored-by: emilylange (cherry picked from commit 855780b11d252447d8eed7b6ecea387f226ac115) --- .../networking/browsers/chromium/common.nix | 3 ++- .../networking/browsers/chromium/upstream-info.nix | 14 +++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 3e6843950856..d5b11ca01ede 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -283,7 +283,7 @@ let ] ++ lib.optionals (chromiumVersionAtLeast "129") [ # Rebased variant of patch right above to build M129+ with our rust and our clang. ./patches/chromium-129-rust.patch - ] ++ lib.optionals (chromiumVersionAtLeast "130") [ + ] ++ lib.optionals (chromiumVersionAtLeast "130" && !ungoogled) [ # Our rustc.llvmPackages is too old for std::hardware_destructive_interference_size # and std::hardware_constructive_interference_size. # So let's revert the change for now and hope that our rustc.llvmPackages and @@ -293,6 +293,7 @@ let # Note: We exclude the changes made to the partition_allocator (PA), as the revert # would otherwise not apply because upstream reverted those changes to PA already # in https://chromium-review.googlesource.com/c/chromium/src/+/5841144 + # Note: ungoogled-chromium already reverts this as part of its patchset. (githubPatch { commit = "fc838e8cc887adbe95110045d146b9d5885bf2a9"; hash = "sha256-NNKzIp6NYdeZaqBLWDW/qNxiDB1VFRz7msjMXuMOrZ8="; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 1e13bee43289..448a50432448 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -21,17 +21,17 @@ ungoogled-chromium = { deps = { gn = { - hash = "sha256-8o3rDdojqVHMQCxI2T3MdJOXKlW3XX7lqpy3zWhJiaA="; - rev = "d010e218ca7077928ad7c9e9cc02fe43b5a8a0ad"; + hash = "sha256-iNXRq3Mr8+wmY1SR4sV7yd2fDiIZ94eReelwFI0UhGU="; + rev = "20806f79c6b4ba295274e3a589d85db41a02fdaa"; url = "https://gn.googlesource.com/gn"; - version = "2024-08-19"; + version = "2024-09-09"; }; ungoogled-patches = { - hash = "sha256-kvpLE6SbXFur5xi1C8Ukvm4OoU5YB8PQCJdiakhFSAM="; - rev = "129.0.6668.100-1"; + hash = "sha256-M+aJ1hhFV88lBBPl9xBYpYRut7yHa/HJYXoclckaZVM="; + rev = "130.0.6723.58-1"; }; }; - hash = "sha256-LOZ9EPw7VgBNEV7Wxb8H5WfSYTTWOL8EDP91uCrZAsA="; - version = "129.0.6668.100"; + hash = "sha256-w1xQr+B7ROeCqBRN+M9vmh45YTRqVfjDYSsN5saDuDo="; + version = "130.0.6723.58"; }; } From e52fbe5ac5ab02b0e384abe800c2174203557ddb Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Thu, 17 Oct 2024 21:15:46 +0000 Subject: [PATCH 17/19] skypeforlinux: 8.129.0.202 -> 8.130.0.205 (cherry picked from commit 88d93cef1aa82c9ee8e9b801f7f4d3340d231d62) --- pkgs/by-name/sk/skypeforlinux/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sk/skypeforlinux/package.nix b/pkgs/by-name/sk/skypeforlinux/package.nix index 8f57dbfafdc0..0fec74f1ea78 100644 --- a/pkgs/by-name/sk/skypeforlinux/package.nix +++ b/pkgs/by-name/sk/skypeforlinux/package.nix @@ -42,8 +42,8 @@ let # Please keep the version x.y.0.z and do not update to x.y.76.z because the # source of the latter disappears much faster. - version = "8.129.0.202"; - revision = "365"; + version = "8.130.0.205"; + revision = "368"; rpath = lib.makeLibraryPath [ @@ -103,7 +103,7 @@ let fetchurl { name = "skypeforlinux-${version}-${revision}.snap"; url = "https://api.snapcraft.io/api/v1/snaps/download/QRDEfjn4WJYnm0FzDKwqqRZZI77awQEV_${revision}.snap"; - hash = "sha512-pxLh/dU/RK1H5gjFLB0V4mVddgQkO8ZcJowpNNihECsLaELgoeXmWXflhYFs2G7fdEzNMeujuc4/ZoGCFSZCvw=="; + hash = "sha512-eDSJQndUDxSsRg9bSevWUih1iXDp3n1kU0RdRAu3GsHeRC/JJx3m4vKxP0F/Rcf2Toxd3MPG2r6Oa1Wa7upcGg=="; } else throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}"; From 4a8bf96d1720d08b3313786e82ea4f507bb13355 Mon Sep 17 00:00:00 2001 From: Sarah Brofeldt Date: Thu, 10 Oct 2024 08:31:29 +0200 Subject: [PATCH 18/19] gitlab: 17.2.8 -> 17.2.9 Fixes CVE-2024-9164 Fixes CVE-2024-8970 Fixes CVE-2024-8977 Fixes CVE-2024-9631 Fixes CVE-2024-6530 Fixes CVE-2024-9623 Fixes CVE-2024-5005 Fixes CVE-2024-9596 (cherry picked from commit 05819f55dad295eaa0ebc6efb3c95a8c48ef3c51) --- .../applications/version-management/gitlab/data.json | 12 ++++++------ .../version-management/gitlab/gitaly/default.nix | 4 ++-- .../gitlab/gitlab-pages/default.nix | 4 ++-- .../gitlab/gitlab-workhorse/default.nix | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 9b4b7f2ae019..033870a4e421 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,15 +1,15 @@ { - "version": "17.2.8", - "repo_hash": "172ba8vlaqphyhi6d5r9j3km7krxcis81dzlr5xch4i0apd0yyag", + "version": "17.2.9", + "repo_hash": "060d5rzbcnhr1fsvbaiirgjm5rjr5c5r6yi601lxvksffyn5hmxw", "yarn_hash": "10y540bxwaz355p9r4q34199aibadrd5p4d9ck2y3n6735k0hm74", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v17.2.8-ee", + "rev": "v17.2.9-ee", "passthru": { - "GITALY_SERVER_VERSION": "17.2.8", - "GITLAB_PAGES_VERSION": "17.2.8", + "GITALY_SERVER_VERSION": "17.2.9", + "GITLAB_PAGES_VERSION": "17.2.9", "GITLAB_SHELL_VERSION": "14.37.0", "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.2.0", - "GITLAB_WORKHORSE_VERSION": "17.2.8" + "GITLAB_WORKHORSE_VERSION": "17.2.9" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 51bf12b80c68..715408b52234 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -7,7 +7,7 @@ }: let - version = "17.2.8"; + version = "17.2.9"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -21,7 +21,7 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - hash = "sha256-3LaBETnwWmiIi7r68NB8LeJ7fo6oP28fS3TbU5JanOE="; + hash = "sha256-UgNQtM3NdAUJVP+vvTHtZWSjCmVzsHlEtXQroxKorIY="; }; vendorHash = "sha256-FqnGVRldhevJgBBvJcvGXzRaYWqSHzZiXIQmCNzJv+4="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix index e30dcebfd697..7fb674689237 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "17.2.8"; + version = "17.2.9"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - hash = "sha256-NaLRCLmgDI4ArJyntkmYICVEpwZtAU6XVTmXAh4kOSc="; + hash = "sha256-ggfPZ/PMjgfRzzPZdVCVydd/4mdCfh2xh7QWGjp5U/0="; }; vendorHash = "sha256-yNHeM8MExcLwv2Ga4vtBmPFBt/Rj7Gd4QQYDlnAIo+c="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index ef6709b94540..235ddbf54aed 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "17.2.8"; + version = "17.2.9"; # nixpkgs-update: no auto update src = fetchFromGitLab { From c1bcb35dacf70e259b2df30e6f6e239bc16fb7f8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Oct 2024 02:12:49 +0000 Subject: [PATCH 19/19] signal-desktop-beta: 7.30.0-beta.1 -> 7.30.0-beta.2 (cherry picked from commit 21b5e29b6e88bf30530c1dd45867d493851dd61e) --- .../instant-messengers/signal-desktop/signal-desktop-beta.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix index 26855ca78429..0cf36580bd08 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix @@ -2,7 +2,7 @@ callPackage ./generic.nix { } rec { pname = "signal-desktop-beta"; dir = "Signal Beta"; - version = "7.30.0-beta.1"; + version = "7.30.0-beta.2"; url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop-beta/signal-desktop-beta_${version}_amd64.deb"; - hash = "sha256-p7FhdB/GysBXKjExioe5kP3uutHgcSdFfcwI/l4Kn8E="; + hash = "sha256-mIdbaS4XNDh3wPTUHAyBqMQ67usp312e1McuFAGPrq0="; }