mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 23:13:19 +00:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
87e63741b7
@ -226,7 +226,7 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
|
||||
|
||||
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
|
||||
|
||||
- `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.
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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";
|
||||
};
|
||||
}
|
||||
@ -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";
|
||||
}
|
||||
@ -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)
|
||||
// {
|
||||
|
||||
@ -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: ''
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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.*'";
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
import ./generic.nix {
|
||||
version = "24.03.1";
|
||||
hash = "sha256-BvMbNkNtyIl8xrUUvJhWWXiLaAHFjiwcq8P7/CGGtzA=";
|
||||
version = "24.03.2";
|
||||
hash = "sha256-pO37MfmvlSd/bU9cGngFEJLnXtZFTqyz1zcYLvFLrrQ=";
|
||||
}
|
||||
|
||||
@ -96,6 +96,7 @@ python.pkgs.buildPythonApplication rec {
|
||||
"pillow"
|
||||
"python-dateutil"
|
||||
"reportlab"
|
||||
"rules"
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python.pkgs; [
|
||||
|
||||
@ -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" ];
|
||||
|
||||
@ -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; {
|
||||
|
||||
@ -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 = [
|
||||
|
||||
@ -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 = [
|
||||
|
||||
@ -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 = [
|
||||
|
||||
@ -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 = [
|
||||
|
||||
@ -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 = ''
|
||||
|
||||
@ -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"
|
||||
];
|
||||
|
||||
@ -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;
|
||||
};
|
||||
|
||||
@ -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 = [
|
||||
|
||||
@ -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 { };
|
||||
@ -32045,12 +32045,12 @@ 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;
|
||||
}) k3s_1_30;
|
||||
k3s = k3s_1_29;
|
||||
k3s = k3s_1_30;
|
||||
|
||||
k3sup = callPackage ../applications/networking/cluster/k3sup { };
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user