From 44d7f66c40c3315b72a49e8e13d0861433218e3b Mon Sep 17 00:00:00 2001 From: "Bryan T. Richardson" Date: Mon, 25 Mar 2024 21:28:46 -0600 Subject: [PATCH 01/19] citrix_workspace: preload pcsclite lib Fixes issue where Citrix Workspace client cannot load libpcsclite.so. --- .../applications/networking/remote/citrix-workspace/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix index f751f3237e41..2dd92d7cc578 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix @@ -150,7 +150,7 @@ stdenv.mkDerivation rec { ${lib.optionalString (icaFlag program != null) ''--add-flags "${icaFlag program} $ICAInstDir"''} \ --set ICAROOT "$ICAInstDir" \ --prefix LD_LIBRARY_PATH : "$ICAInstDir:$ICAInstDir/lib" \ - --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ + --set LD_PRELOAD "${libredirect}/lib/libredirect.so ${lib.getLib pcsclite}/lib/libpcsclite.so" \ --set NIX_REDIRECTS "/usr/share/zoneinfo=${tzdata}/share/zoneinfo:/etc/zoneinfo=${tzdata}/share/zoneinfo:/etc/timezone=$ICAInstDir/timezone" ''; wrapLink = program: '' From 51cd84ba57e5acde737d71919b1728fb309b1296 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 29 Apr 2024 01:41:45 +0200 Subject: [PATCH 02/19] pkgs/README.md: add `meta.mainProgram` to new-package checklist template The document already states that `meta.mainProgram` is mandatory for new packages, this change adds it to the template list of checks during review. --- pkgs/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/README.md b/pkgs/README.md index 5439ad913d18..fd958702fb49 100644 --- a/pkgs/README.md +++ b/pkgs/README.md @@ -748,6 +748,7 @@ Review process: - License must match the upstream license. - Platforms should be set (or the package will not get binary substitutes). - Maintainers must be set. This can be the package submitter or a community member that accepts taking up maintainership of the package. + - The `meta.mainProgram` must be set if a main executable exists. - Report detected typos. - Ensure the package source: - Uses `mirror://` URLs when available. @@ -769,6 +770,7 @@ Sample template for a new package review is provided below. - [ ] `meta.license` fits upstream license - [ ] `meta.platforms` is set - [ ] `meta.maintainers` is set +- [ ] `meta.mainProgram` is set, if applicable. - [ ] build time only dependencies are declared in `nativeBuildInputs` - [ ] source is fetched using the appropriate function - [ ] the list of `phases` is not overridden From 1b897f8741fc1de25a0e25f95ca2c5f0c7785dbd Mon Sep 17 00:00:00 2001 From: ok-nick Date: Tue, 7 May 2024 21:59:36 -0400 Subject: [PATCH 03/19] c2patool: 0.8.2 -> 0.9.0 --- pkgs/by-name/c2/c2patool/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/c2/c2patool/package.nix b/pkgs/by-name/c2/c2patool/package.nix index d715a062568a..a334b857acc5 100644 --- a/pkgs/by-name/c2/c2patool/package.nix +++ b/pkgs/by-name/c2/c2patool/package.nix @@ -10,16 +10,16 @@ }: rustPlatform.buildRustPackage rec { pname = "c2patool"; - version = "0.8.2"; + version = "0.9.0"; src = fetchFromGitHub { owner = "contentauth"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fVH7itpVPg0vkgKSWa9x61yttLx73gTeLT5+R4aSOFE="; + sha256 = "sha256-yR6VepMZquURDb2SDwx+xE55jo3MTzh6ntSrQln1Xxs="; }; - cargoHash = "sha256-oNNfQIwl7QprrlpIZrTYVGp/UMWANVr3b3ALFKupyy8="; + cargoHash = "sha256-Z4Q/33CwbJXlMZBq4WRT2k78PvaHpNm4pQkiAehCImI="; # use the non-vendored openssl OPENSSL_NO_VENDOR = 1; From 1d3356ec27a9e02afd25346ae1a55622702c95c5 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Tue, 14 May 2024 11:49:24 -0300 Subject: [PATCH 04/19] k3s: k3s_1_29 -> k3s_1_30 Bump k3s (latest) alias from k3s_1_29 to k3s_1_30. https://github.com/k3s-io/k3s/releases/tag/v1.30.0%2Bk3s1 https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.30.md#changelog-since-v1290 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 70c7e48a82bb..80e30dbdcd33 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32073,7 +32073,7 @@ with pkgs; buildGoModule = buildGo122Module; go = go_1_22; }) k3s_1_30; - k3s = k3s_1_29; + k3s = k3s_1_30; k3sup = callPackage ../applications/networking/cluster/k3sup { }; From ec0c76904bd85ffef8291b034c4203c7e69750f5 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Tue, 14 May 2024 23:10:35 +0000 Subject: [PATCH 05/19] ovn: 24.03.1 -> 24.03.2 https://www.ovn.org/en/releases/24.03/ --- pkgs/by-name/ov/ovn/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ov/ovn/package.nix b/pkgs/by-name/ov/ovn/package.nix index 0fb24a386c70..a4db76f1cce6 100644 --- a/pkgs/by-name/ov/ovn/package.nix +++ b/pkgs/by-name/ov/ovn/package.nix @@ -1,4 +1,4 @@ import ./generic.nix { - version = "24.03.1"; - hash = "sha256-BvMbNkNtyIl8xrUUvJhWWXiLaAHFjiwcq8P7/CGGtzA="; + version = "24.03.2"; + hash = "sha256-pO37MfmvlSd/bU9cGngFEJLnXtZFTqyz1zcYLvFLrrQ="; } From df8ea8cdc46757188572936caac181bdbc8a6971 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Tue, 14 May 2024 19:14:05 -0400 Subject: [PATCH 06/19] ovn-lts: 22.03.7 -> 24.03.2 update LTS major version https://www.ovn.org/en/releases/24.03/ --- pkgs/by-name/ov/ovn/lts.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ov/ovn/lts.nix b/pkgs/by-name/ov/ovn/lts.nix index 26ec2fe7a573..42ab99ff7cc0 100644 --- a/pkgs/by-name/ov/ovn/lts.nix +++ b/pkgs/by-name/ov/ovn/lts.nix @@ -1,5 +1,5 @@ import ./generic.nix { - version = "22.03.7"; - hash = "sha256-HzVzJN1QnMTlv39I7clzciJD/Owm93jFO4qfaE1k6e4="; - updateScriptArgs = "--lts=true --regex '22.03.*'"; + version = "24.03.2"; + hash = "sha256-pO37MfmvlSd/bU9cGngFEJLnXtZFTqyz1zcYLvFLrrQ="; + updateScriptArgs = "--lts=true --regex '24.03.*'"; } From 7617a60db234a8dc1acae1ef17a95ee120b9bb0c Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 18 May 2024 08:55:32 +0900 Subject: [PATCH 07/19] python311Packages.anywidget: 0.9.10 -> 0.9.11 Changelog: https://github.com/manzt/anywidget/releases/tag/anywidget%400.9.11 --- pkgs/development/python-modules/anywidget/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/anywidget/default.nix b/pkgs/development/python-modules/anywidget/default.nix index 767fc775851d..51f6131ae5e6 100644 --- a/pkgs/development/python-modules/anywidget/default.nix +++ b/pkgs/development/python-modules/anywidget/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "anywidget"; - version = "0.9.10"; + version = "0.9.11"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-OQpigkCYHAmBPHUjJ53cq4L/T9Moet1UM7eLE2kIkGg="; + hash = "sha256-WN3tjobsJ84odgyUVzF2YxE9mvYIlH7mqNDstSiyLNw="; }; # We do not need the jupyterlab build dependency, because we do not need to @@ -48,6 +48,11 @@ buildPythonPackage rec { watchfiles ]; + disabledTests = [ + # requires package.json + "test_version" + ]; + pythonImportsCheck = [ "anywidget" ]; meta = with lib; { From d9f18d92159f1c6670b1b4c0bf58a2c5bd0705df Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 18 May 2024 08:56:32 +0900 Subject: [PATCH 08/19] python311Packages.jupyterlab: 4.1.8 -> 4.2.0 Changelog: https://github.com/jupyterlab/jupyterlab/blob/v4.2.0/CHANGELOG.md --- pkgs/development/python-modules/jupyterlab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index 7b9a17d91e2c..dc8c475474aa 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "jupyterlab"; - version = "4.1.8"; + version = "4.2.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-M4St7YaA585QT9Y7i7iaOd8hycdpTZ59xKaHQs2zD5s="; + hash = "sha256-NW6SBaaiq2icR8j+SRnbpsB243bQPya6rcBXSMJDXdU="; }; nativeBuildInputs = [ From 275b42f8e3b4b80643dc31a9b5fafafde1a8427f Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 18 May 2024 08:56:37 +0900 Subject: [PATCH 09/19] python311Packages.jupyterlab-git: 0.50.0 -> 0.50.1 Changelog: https://github.com/jupyterlab/jupyterlab-git/blob/v0.50.1/CHANGELOG.md --- pkgs/development/python-modules/jupyterlab-git/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyterlab-git/default.nix b/pkgs/development/python-modules/jupyterlab-git/default.nix index 512c79947457..9377df6d75cf 100644 --- a/pkgs/development/python-modules/jupyterlab-git/default.nix +++ b/pkgs/development/python-modules/jupyterlab-git/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "jupyterlab-git"; - version = "0.50.0"; + version = "0.50.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "jupyterlab_git"; inherit version; - hash = "sha256-CYWVRtOQE067kYqWXCw/4mBf6v4yfPYWFb592Qtb37s="; + hash = "sha256-v08Go/vCsquE6l1SMmqg4LjM9OmjNX+jGKEZVg4cak0="; }; nativeBuildInputs = [ From a8b6a40244cd2b7986eb06e4a8d55fe73224be38 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 18 May 2024 08:56:47 +0900 Subject: [PATCH 10/19] python311Packages.marimo: 0.4.10 -> 0.6.0 Changelog: https://github.com/marimo-team/marimo/releases/tag/0.6.0 --- .../python-modules/marimo/default.nix | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/marimo/default.nix b/pkgs/development/python-modules/marimo/default.nix index 54f6fd858e35..8b3fd204e54c 100644 --- a/pkgs/development/python-modules/marimo/default.nix +++ b/pkgs/development/python-modules/marimo/default.nix @@ -3,30 +3,32 @@ , fetchPypi , pythonOlder , setuptools +, black , click +, docutils +, itsdangerous , jedi , markdown -, pymdown-extensions +, psutil , pygments +, pymdown-extensions +, starlette , tomlkit , uvicorn -, starlette , websockets -, docutils -, black , pytestCheckHook }: buildPythonPackage rec { pname = "marimo"; - version = "0.4.10"; + version = "0.6.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-F6Hf8KPIkXuRhO/1mVHE1wfU6//vbUK1ghoqANmZjag="; + hash = "sha256-L6ICaaMRrMOr/d8CJGcXxOYCWTVh8ObckW7xNeLRB2Q="; }; build-system = [ @@ -34,17 +36,19 @@ buildPythonPackage rec { ]; dependencies = [ + black click + docutils + itsdangerous jedi markdown - pymdown-extensions + psutil pygments + pymdown-extensions + starlette tomlkit uvicorn - starlette websockets - docutils - black ]; nativeCheckInputs = [ From 2ad6437b10ac9a6618b9dc566044e5e2c3ee25b6 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 18 May 2024 08:57:02 +0900 Subject: [PATCH 11/19] python311Packages.nbdev: 2.3.21 -> 2.3.22 Changelog: https://github.com/fastai/nbdev/blob/2.3.22/CHANGELOG.md --- pkgs/development/python-modules/nbdev/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nbdev/default.nix b/pkgs/development/python-modules/nbdev/default.nix index 4178f611e43d..02e938ae7ed4 100644 --- a/pkgs/development/python-modules/nbdev/default.nix +++ b/pkgs/development/python-modules/nbdev/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "nbdev"; - version = "2.3.21"; + version = "2.3.22"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-H3KHnVOdy+Hdpka+dxp/qPj1HZSXIbXJshnZuXVo9DQ="; + hash = "sha256-CO88zk4aPoaYokt98IYXpfTrhdVBgCwM9BSiKqWeKm4="; }; nativeBuildInputs = [ From e0e3ea5dfd8f5d04839d2f854e55fa7464673a25 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 18 May 2024 08:57:13 +0900 Subject: [PATCH 12/19] python311Packages.notebook: 7.1.3 -> 7.2.0 Changelog: https://github.com/jupyter/notebook/blob/v7.2.0/CHANGELOG.md --- pkgs/development/python-modules/notebook/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix index 6f09fdae9c67..c1a55c2f0203 100644 --- a/pkgs/development/python-modules/notebook/default.nix +++ b/pkgs/development/python-modules/notebook/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "notebook"; - version = "7.1.3"; + version = "7.2.0"; disabled = pythonOlder "3.8"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-Qfzr/0TPe7k3cYCAi8uuBmYptV2MdyLx6751ykT5z8E="; + hash = "sha256-NKK6SwitXRnskw23SE+3l0aheEvp4aX4IY+a+GVqFB8="; }; postPatch = '' From 8082d3c3f1648a820023e6a56e7a746668b30225 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 18 May 2024 16:26:17 +0200 Subject: [PATCH 13/19] python312Packages.homeassistant-stubs: 2024.5.3 -> 2024.5.4 https://github.com/KapJI/homeassistant-stubs/releases/tag/2024.5.4 --- pkgs/servers/home-assistant/stubs.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index f09d06370eaf..6587cda515dc 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2024.5.3"; + version = "2024.5.4"; format = "pyproject"; disabled = python.version != home-assistant.python.version; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; rev = "refs/tags/${version}"; - hash = "sha256-cWt5hOLnri+m7WXAjCA3z1k5ctDia2sAoZiyGe8zadI="; + hash = "sha256-wW3qRXdT3FmAj5bOBzBmrD97o/pONowi7F0Cbj6ndLg="; }; nativeBuildInputs = [ From ece3b84f622445da960b40f4a223c760c7ce181d Mon Sep 17 00:00:00 2001 From: aleksana Date: Sun, 19 May 2024 00:54:22 +0800 Subject: [PATCH 14/19] firmware-manager: correct license and add mainProgram License is mentioned here: License is mentioned here: pop-os/firmware-manager@3c542bd/assets/com.system76.FirmwareManager.appdata.xml#L5-L6 --- pkgs/os-specific/linux/firmware/firmware-manager/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/firmware/firmware-manager/default.nix b/pkgs/os-specific/linux/firmware/firmware-manager/default.nix index 57b4207e383d..1682f16c3903 100644 --- a/pkgs/os-specific/linux/firmware/firmware-manager/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-manager/default.nix @@ -53,7 +53,8 @@ stdenv.mkDerivation rec { meta = { description = "Graphical frontend for firmware management"; homepage = "https://github.com/pop-os/firmware-manager"; - license = lib.licenses.gpl3; + license = with lib.licenses; [ gpl3Plus cc0 ]; + mainProgram = "com.system76.FirmwareManager"; maintainers = [ lib.maintainers.shlevy ]; platforms = lib.platforms.linux; }; From f9f118d44c0bebcb646b28282db35d377ef5b316 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 19 May 2024 02:00:32 +0200 Subject: [PATCH 15/19] python312Packages.rules: 3.3.0 -> 3.4.0 https://github.com/dfunckt/django-rules/blob/v3.4.0/CHANGELOG.md --- pkgs/development/python-modules/rules/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/rules/default.nix b/pkgs/development/python-modules/rules/default.nix index 3563b76affe7..cc153e44c6f3 100644 --- a/pkgs/development/python-modules/rules/default.nix +++ b/pkgs/development/python-modules/rules/default.nix @@ -2,6 +2,9 @@ , buildPythonPackage , fetchFromGitHub +# build-system +, setuptools + # tests , django , djangorestframework @@ -10,16 +13,20 @@ buildPythonPackage rec { pname = "rules"; - version = "3.3.0"; - format = "setuptools"; + version = "3.4.0"; + pyproject = true; src = fetchFromGitHub { owner = "dfunckt"; repo = "django-rules"; rev = "v${version}"; - hash = "sha256-UFRfRwcvxEn0fD3ScJJ7f/EHd93BOpY3cEF9QDryJZY="; + hash = "sha256-fxLaxjni+0S59vtvKBduR0pYMwJWWBPzR5mnH+j6gVE="; }; + build-system = [ + setuptools + ]; + pythonImportsCheck = [ "rules" ]; From 0b073454231a19db2ee189cfcade1443228faaa9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 19 May 2024 02:11:36 +0200 Subject: [PATCH 16/19] pretalx: relax rules constraint --- pkgs/by-name/pr/pretalx/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/pr/pretalx/package.nix b/pkgs/by-name/pr/pretalx/package.nix index f3582c1b7fb5..4674812339ae 100644 --- a/pkgs/by-name/pr/pretalx/package.nix +++ b/pkgs/by-name/pr/pretalx/package.nix @@ -96,6 +96,7 @@ python.pkgs.buildPythonApplication rec { "pillow" "python-dateutil" "reportlab" + "rules" ]; propagatedBuildInputs = with python.pkgs; [ From d95a9f092c37c20952c145063581dc1897e05112 Mon Sep 17 00:00:00 2001 From: "Winston R. Milling" Date: Sat, 18 May 2024 22:50:05 -0500 Subject: [PATCH 17/19] k3s_1_26: remove package --- .../cluster/k3s/1_26/chart-versions.nix | 10 ---------- .../networking/cluster/k3s/1_26/versions.nix | 14 -------------- .../networking/cluster/k3s/default.nix | 17 +++-------------- pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 4 insertions(+), 39 deletions(-) delete mode 100644 pkgs/applications/networking/cluster/k3s/1_26/chart-versions.nix delete mode 100644 pkgs/applications/networking/cluster/k3s/1_26/versions.nix diff --git a/pkgs/applications/networking/cluster/k3s/1_26/chart-versions.nix b/pkgs/applications/networking/cluster/k3s/1_26/chart-versions.nix deleted file mode 100644 index a0341b7cbdec..000000000000 --- a/pkgs/applications/networking/cluster/k3s/1_26/chart-versions.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ - traefik-crd = { - url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-25.0.2+up25.0.0.tgz"; - sha256 = "0jygzsn5pxzf7423x5iqfffgx5xvm7c7hfck46y7vpv1fdkiipcq"; - }; - traefik = { - url = "https://k3s.io/k3s-charts/assets/traefik/traefik-25.0.2+up25.0.0.tgz"; - sha256 = "1g9n19lnqdkmbbr3rnbwc854awha0kqqfwyxanyx1lg5ww8ldp89"; - }; -} diff --git a/pkgs/applications/networking/cluster/k3s/1_26/versions.nix b/pkgs/applications/networking/cluster/k3s/1_26/versions.nix deleted file mode 100644 index 6ac3414b1b0e..000000000000 --- a/pkgs/applications/networking/cluster/k3s/1_26/versions.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ - k3sVersion = "1.26.15+k3s1"; - k3sCommit = "132972364806998c35d250153e2af245f9ecf18d"; - k3sRepoSha256 = "13iwmjxyf71l2g66kxdivnj21bf9lmr5p4qlp8kmysm23w2badj9"; - k3sVendorHash = "sha256-xoscRchOK4p3d1DAnxbJq7oIvxIn1twePmOBDdfXzw8="; - chartVersions = import ./chart-versions.nix; - k3sRootVersion = "0.12.2"; - k3sRootSha256 = "1gjynvr350qni5mskgm7pcc7alss4gms4jmkiv453vs8mmma9c9k"; - k3sCNIVersion = "1.4.0-k3s2"; - k3sCNISha256 = "17dg6jgjx18nrlyfmkv14dhzxsljz4774zgwz5dchxcf38bvarqa"; - containerdVersion = "1.7.11-k3s2.26"; - containerdSha256 = "0413a81kzb05xkklwyngg8g6a0w4icsi938rim69jmr2sijc89ww"; - criCtlVersion = "1.26.0-rc.0-k3s1"; -} diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index 58984502d98f..6e7cfb0d1325 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -12,17 +12,7 @@ let extraArgs = builtins.removeAttrs args [ "callPackage" ]; in { - k3s_1_26 = common ( - (import ./1_26/versions.nix) - // { - updateScript = [ - ./update-script.sh - "26" - ]; - } - ) extraArgs; - - # 1_27 can be built with the same builder as 1_26 + # 1_27 can be built with the same builder as 1_30 k3s_1_27 = common ( (import ./1_27/versions.nix) // { @@ -33,7 +23,7 @@ in } ) extraArgs; - # 1_28 can be built with the same builder as 1_26 + # 1_28 can be built with the same builder as 1_30 k3s_1_28 = common ( (import ./1_28/versions.nix) // { @@ -44,7 +34,7 @@ in } ) extraArgs; - # 1_29 can be built with the same builder as 1_26 + # 1_29 can be built with the same builder as 1_30 k3s_1_29 = common ( (import ./1_29/versions.nix) // { @@ -55,7 +45,6 @@ in } ) extraArgs; - # 1_30 can be built with the same builder as 1_26 k3s_1_30 = common ( (import ./1_30/versions.nix) // { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cefca0ede904..0714c95f4f9c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32047,7 +32047,7 @@ with pkgs; inherit (callPackage ../applications/networking/cluster/k3s { buildGoModule = buildGo121Module; go = go_1_21; - }) k3s_1_26 k3s_1_27 k3s_1_28 k3s_1_29; + }) k3s_1_27 k3s_1_28 k3s_1_29; inherit (callPackage ../applications/networking/cluster/k3s { buildGoModule = buildGo122Module; go = go_1_22; From b94bc3b0c45d723a62703b2d74aef68144868a30 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Sun, 19 May 2024 00:52:46 -0300 Subject: [PATCH 18/19] nixos/rl-2405: k3s was upgraded to 1.30 Co-authored-by: @wrmilling --- nixos/doc/manual/release-notes/rl-2405.section.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index 489474468466..83adc69a4ee1 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -219,7 +219,7 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m -- `k3s`: was updated to version [v1.29](https://github.com/k3s-io/k3s/releases/tag/v1.29.1%2Bk3s2), all previous versions (k3s_1_26, k3s_1_27, k3s_1_28) will be removed. See [changelog and upgrade notes](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.29.md#urgent-upgrade-notes) for more information. +- `k3s`: has been updated to version [v1.30](https://github.com/k3s-io/k3s/releases/tag/v1.30.0%2Bk3s1), previous supported versions are available under release specific names (e.g. k3s_1_27, k3s_1_28, and k3s_1_29) and present to help you migrate to the latest supported version. See [changelog and upgrade notes](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.30.md#changelog-since-v1290) for more information. - `himalaya` was updated to v1.0.0-beta.4, which introduces breaking changes. Check out the [release note](https://github.com/soywod/himalaya/releases/tag/v1.0.0-beta.4) for details. From 70e4cf2354cc94fc9351d477c302c5d3247863cc Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sun, 19 May 2024 07:19:36 +0300 Subject: [PATCH 19/19] netcdffortran: fix darwin build (#312683) --- .../development/libraries/netcdf-fortran/default.nix | 12 ++++++++++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/netcdf-fortran/default.nix b/pkgs/development/libraries/netcdf-fortran/default.nix index 978f906b7adc..0edc956eee60 100644 --- a/pkgs/development/libraries/netcdf-fortran/default.nix +++ b/pkgs/development/libraries/netcdf-fortran/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, netcdf, hdf5, curl, gfortran, CoreFoundation }: +{ lib, stdenv, fetchFromGitHub, netcdf, hdf5, curl, gfortran, CoreFoundation, CoreServices, SystemConfiguration }: stdenv.mkDerivation rec { pname = "netcdf-fortran"; version = "4.4.5"; @@ -12,7 +12,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gfortran ]; buildInputs = [ netcdf hdf5 curl ] - ++ lib.optional stdenv.isDarwin CoreFoundation; + ++ lib.optionals stdenv.isDarwin [ + CoreFoundation + CoreServices + SystemConfiguration + ]; + env.NIX_LDFLAGS = toString (lib.optionals stdenv.isDarwin [ + "-F${CoreServices}/Library/Frameworks" + "-F${SystemConfiguration}/Library/Frameworks" + ]); doCheck = true; FFLAGS = [ "-std=legacy" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 82de9b0bdb77..1bff1bfb5cf3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10841,7 +10841,7 @@ with pkgs; netcdfcxx4 = callPackage ../development/libraries/netcdf-cxx4 { }; netcdffortran = callPackage ../development/libraries/netcdf-fortran { - inherit (darwin.apple_sdk.frameworks) CoreFoundation; + inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices SystemConfiguration; }; networking-ts-cxx = callPackage ../development/libraries/networking-ts-cxx { };