Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
5b50965f04
@ -16592,6 +16592,13 @@
|
||||
githubId = 2770647;
|
||||
name = "Simon Vandel Sillesen";
|
||||
};
|
||||
sinanmohd = {
|
||||
name = "Sinan Mohd";
|
||||
email = "sinan@firemail.cc";
|
||||
matrix = "@sinan:sinanmohd.com";
|
||||
github = "sinanmohd";
|
||||
githubId = 69694713;
|
||||
};
|
||||
sioodmy = {
|
||||
name = "Antoni Sokołowski";
|
||||
github = "sioodmy";
|
||||
|
||||
@ -65,6 +65,8 @@
|
||||
|
||||
- [hddfancontrol](https://github.com/desbma/hddfancontrol), a service to regulate fan speeds based on hard drive temperature. Available as [services.hddfancontrol](#opt-services.hddfancontrol.enable).
|
||||
|
||||
- [seatd](https://sr.ht/~kennylevinsen/seatd/), A minimal seat management daemon. Available as [services.seatd](#opt-services.seatd.enable).
|
||||
|
||||
- [GoToSocial](https://gotosocial.org/), an ActivityPub social network server, written in Golang. Available as [services.gotosocial](#opt-services.gotosocial.enable).
|
||||
|
||||
- [Castopod](https://castopod.org/), an open-source hosting platform made for podcasters who want to engage and interact with their audience. Available as [services.castopod](#opt-services.castopod.enable).
|
||||
@ -443,6 +445,10 @@
|
||||
|
||||
- A new option was added to the virtualisation module that enables specifying explicitly named network interfaces in QEMU VMs. The existing `virtualisation.vlans` is still supported for cases where the name of the network interface is irrelevant.
|
||||
|
||||
- Apptainer/Singularity now defaults to using `"$out/var/lib"` for the `LOCALSTATEDIR` configuration option instead of the top-level `"/var/lib"`. This change impacts the `SESSIONDIR` (container-run-time mount point) configuration, which is set to `$LOCALSTATEDIR/<apptainer or singularity>/mnt/session`. This detaches the packages from the top-level directory, rendering the NixOS module optional.
|
||||
|
||||
The default behavior of the NixOS module `programs.singularity` stays unchanged. We add a new option `programs.singularity.enableExternalSysConfDir` (default to `true`) to specify whether to set the top-level `"/var/lib"` as `LOCALSTATEDIR` or not.
|
||||
|
||||
- DocBook option documentation is no longer supported, all module documentation now uses markdown.
|
||||
|
||||
- `services.outline` can now be configured to use local filesystem storage instead of S3 storage using [services.outline.storage.storageType](#opt-services.outline.storage.storageType).
|
||||
|
||||
@ -474,6 +474,7 @@
|
||||
./services/desktops/pipewire/pipewire.nix
|
||||
./services/desktops/pipewire/wireplumber.nix
|
||||
./services/desktops/profile-sync-daemon.nix
|
||||
./services/desktops/seatd.nix
|
||||
./services/desktops/system-config-printer.nix
|
||||
./services/desktops/system76-scheduler.nix
|
||||
./services/desktops/telepathy.nix
|
||||
|
||||
@ -45,6 +45,18 @@ in
|
||||
Use `lib.mkForce` to forcefully specify the overridden package.
|
||||
'';
|
||||
};
|
||||
enableExternalLocalStateDir = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
example = false;
|
||||
description = mdDoc ''
|
||||
Whether to use top-level directories as LOCALSTATEDIR
|
||||
instead of the store path ones.
|
||||
This affects the SESSIONDIR of Apptainer/Singularity.
|
||||
If set to true, the SESSIONDIR will become
|
||||
`/var/lib/''${projectName}/mnt/session`.
|
||||
'';
|
||||
};
|
||||
enableFakeroot = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
@ -65,7 +77,9 @@ in
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
programs.singularity.packageOverriden = (cfg.package.override (
|
||||
optionalAttrs cfg.enableFakeroot {
|
||||
optionalAttrs cfg.enableExternalLocalStateDir {
|
||||
externalLocalStateDir = "/var/lib";
|
||||
} // optionalAttrs cfg.enableFakeroot {
|
||||
newuidmapPath = "/run/wrappers/bin/newuidmap";
|
||||
newgidmapPath = "/run/wrappers/bin/newgidmap";
|
||||
} // optionalAttrs cfg.enableSuid {
|
||||
@ -80,12 +94,8 @@ in
|
||||
group = "root";
|
||||
source = "${cfg.packageOverriden}/libexec/${cfg.packageOverriden.projectName}/bin/starter-suid.orig";
|
||||
};
|
||||
systemd.tmpfiles.rules = [
|
||||
systemd.tmpfiles.rules = mkIf cfg.enableExternalLocalStateDir [
|
||||
"d /var/lib/${cfg.packageOverriden.projectName}/mnt/session 0770 root root -"
|
||||
"d /var/lib/${cfg.packageOverriden.projectName}/mnt/final 0770 root root -"
|
||||
"d /var/lib/${cfg.packageOverriden.projectName}/mnt/overlay 0770 root root -"
|
||||
"d /var/lib/${cfg.packageOverriden.projectName}/mnt/container 0770 root root -"
|
||||
"d /var/lib/${cfg.packageOverriden.projectName}/mnt/source 0770 root root -"
|
||||
];
|
||||
};
|
||||
|
||||
|
||||
51
nixos/modules/services/desktops/seatd.nix
Normal file
51
nixos/modules/services/desktops/seatd.nix
Normal file
@ -0,0 +1,51 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
let
|
||||
cfg = config.services.seatd;
|
||||
inherit (lib) mkEnableOption mkOption mdDoc types;
|
||||
in
|
||||
{
|
||||
meta.maintainers = with lib.maintainers; [ sinanmohd ];
|
||||
|
||||
options.services.seatd = {
|
||||
enable = mkEnableOption (mdDoc "seatd");
|
||||
|
||||
user = mkOption {
|
||||
type = types.str;
|
||||
default = "root";
|
||||
description = mdDoc "User to own the seatd socket";
|
||||
};
|
||||
group = mkOption {
|
||||
type = types.str;
|
||||
default = "seat";
|
||||
description = mdDoc "Group to own the seatd socket";
|
||||
};
|
||||
logLevel = mkOption {
|
||||
type = types.enum [ "debug" "info" "error" "silent" ];
|
||||
default = "info";
|
||||
description = mdDoc "Logging verbosity";
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
environment.systemPackages = with pkgs; [ seatd sdnotify-wrapper ];
|
||||
users.groups.seat = lib.mkIf (cfg.group == "seat") {};
|
||||
|
||||
systemd.services.seatd = {
|
||||
description = "Seat management daemon";
|
||||
documentation = [ "man:seatd(1)" ];
|
||||
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
restartIfChanged = false;
|
||||
|
||||
serviceConfig = {
|
||||
Type = "notify";
|
||||
NotifyAccess = "all";
|
||||
SyslogIdentifier = "seatd";
|
||||
ExecStart = "${pkgs.sdnotify-wrapper}/bin/sdnotify-wrapper ${pkgs.seatd.bin}/bin/seatd -n 1 -u ${cfg.user} -g ${cfg.group} -l ${cfg.logLevel}";
|
||||
RestartSec = 1;
|
||||
Restart = "always";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
@ -742,6 +742,7 @@ in {
|
||||
sddm = handleTest ./sddm.nix {};
|
||||
seafile = handleTest ./seafile.nix {};
|
||||
searx = handleTest ./searx.nix {};
|
||||
seatd = handleTest ./seatd.nix {};
|
||||
service-runner = handleTest ./service-runner.nix {};
|
||||
sftpgo = runTest ./sftpgo.nix;
|
||||
sfxr-qt = handleTest ./sfxr-qt.nix {};
|
||||
|
||||
51
nixos/tests/seatd.nix
Normal file
51
nixos/tests/seatd.nix
Normal file
@ -0,0 +1,51 @@
|
||||
import ./make-test-python.nix ({ pkgs, lib, ... }:
|
||||
|
||||
let
|
||||
seatd-test = pkgs.writeShellApplication {
|
||||
name = "seatd-client-pid";
|
||||
text = ''
|
||||
journalctl -u seatd --no-pager -b | while read -r line; do
|
||||
case "$line" in
|
||||
*"New client connected"*)
|
||||
line="''${line##*pid: }"
|
||||
pid="''${line%%,*}"
|
||||
;;
|
||||
*"Opened client"*)
|
||||
echo "$pid"
|
||||
exit
|
||||
esac
|
||||
done;
|
||||
'';
|
||||
};
|
||||
in
|
||||
{
|
||||
name = "seatd";
|
||||
meta.maintainers = with lib.maintainers; [ sinanmohd ];
|
||||
|
||||
nodes.machine = { ... }: {
|
||||
imports = [ ./common/user-account.nix ];
|
||||
services.getty.autologinUser = "alice";
|
||||
users.users.alice.extraGroups = [ "seat" "wheel" ];
|
||||
|
||||
fonts.enableDefaultPackages = true;
|
||||
environment.systemPackages = with pkgs; [
|
||||
dwl
|
||||
foot
|
||||
seatd-test
|
||||
];
|
||||
|
||||
programs.bash.loginShellInit = ''
|
||||
[ "$(tty)" = "/dev/tty1" ] &&
|
||||
dwl -s 'foot touch /tmp/foot_started'
|
||||
'';
|
||||
|
||||
hardware.opengl.enable = true;
|
||||
virtualisation.qemu.options = [ "-vga none -device virtio-gpu-pci" ];
|
||||
services.seatd.enable = true;
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
machine.wait_for_file("/tmp/foot_started")
|
||||
machine.succeed("test $(seatd-client-pid) = $(pgrep dwl)")
|
||||
'';
|
||||
})
|
||||
@ -2,14 +2,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "oxker";
|
||||
version = "0.3.3";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-2zdsVItGZYQydpC9E/uCbzOE9Xoh7zTqa9DpxA5qNCc=";
|
||||
sha256 = "sha256-zre4ccMmv1NWcokLvEFRIf+kornAnge/a3c3b6IO03o=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-FXYFQpiK2BGUz9GjsUPS9LWPeezbBQ3A33juoVCl71g=";
|
||||
cargoHash = "sha256-xdfaTVRt5h4q0kfAE1l6pOXCfk0Cb8TnKNMZeeGvciY=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A simple tui to view & control docker containers";
|
||||
|
||||
@ -6,6 +6,7 @@
|
||||
, scdoc
|
||||
, stdenv
|
||||
, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@ -40,8 +41,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"-Dserver=enabled"
|
||||
];
|
||||
|
||||
passthru.tests.basic = nixosTests.seatd;
|
||||
|
||||
meta = {
|
||||
description = "A universal seat management library";
|
||||
description = "A minimal seat management daemon, and a universal seat management library";
|
||||
changelog = "https://git.sr.ht/~kennylevinsen/seatd/refs/${finalAttrs.version}";
|
||||
homepage = "https://sr.ht/~kennylevinsen/seatd/";
|
||||
license = lib.licenses.mit;
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubergrunt";
|
||||
version = "0.12.1";
|
||||
version = "0.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gruntwork-io";
|
||||
repo = "kubergrunt";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-qd+7tYvRpRMg8Y83L/K8g8fWrfO4rAQj72EpunqfSsc=";
|
||||
sha256 = "sha256-ZUuMQ0y6qXM9g/snJchqGPf7z+5skE/OPqC3rvRenXo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-AUw1wJNWjpNVsjw/Hr1ZCePYWQkf1SqRVnQgi8tOFG0=";
|
||||
|
||||
@ -1,8 +1,11 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, python3
|
||||
, qt6
|
||||
, qtbase
|
||||
, qtsvg
|
||||
, qtwayland
|
||||
, nixosTests
|
||||
, wrapQtAppsHook
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
@ -28,12 +31,13 @@ python3.pkgs.buildPythonApplication rec {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qt6.qtbase
|
||||
qt6.qtsvg # Needed for the systray icon
|
||||
qtwayland
|
||||
qtbase
|
||||
qtsvg # Needed for the systray icon
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
qt6.wrapQtAppsHook
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
@ -71,6 +71,8 @@ in
|
||||
, newuidmapPath ? null
|
||||
# Path to SUID-ed newgidmap executable
|
||||
, newgidmapPath ? null
|
||||
# External LOCALSTATEDIR
|
||||
, externalLocalStateDir ? null
|
||||
# Remove the symlinks to `singularity*` when projectName != "singularity"
|
||||
, removeCompat ? false
|
||||
# Workaround #86349
|
||||
@ -106,6 +108,7 @@ in
|
||||
inherit
|
||||
enableSeccomp
|
||||
enableSuid
|
||||
externalLocalStateDir
|
||||
projectName
|
||||
removeCompat
|
||||
starterSuidPath
|
||||
@ -141,7 +144,7 @@ in
|
||||
configureScript = "./mconfig";
|
||||
|
||||
configureFlags = [
|
||||
"--localstatedir=/var/lib"
|
||||
"--localstatedir=${if externalLocalStateDir != null then externalLocalStateDir else "${placeholder "out"}/var/lib"}"
|
||||
"--runstatedir=/var/run"
|
||||
]
|
||||
++ lib.optional (!enableSeccomp) "--without-seccomp"
|
||||
|
||||
@ -111,7 +111,7 @@ rec {
|
||||
touch .${projectName}.d/env/94-appsbase.sh
|
||||
|
||||
cd ..
|
||||
mkdir -p /var/lib/${projectName}/mnt/{container,final,overlay,session,source}
|
||||
mkdir -p /var/lib/${projectName}/mnt/session
|
||||
echo "root:x:0:0:System administrator:/root:/bin/sh" > /etc/passwd
|
||||
echo > /etc/resolv.conf
|
||||
TMPDIR=$(pwd -P) ${projectName} build $out ./img
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rqbit";
|
||||
version = "2.2.2";
|
||||
version = "3.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ikatson";
|
||||
repo = "rqbit";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-9yYHxlvRlO8iJ3SPi0+4lEgBgAaqaDffKChqAe4OsYU=";
|
||||
hash = "sha256-c0JYFr2yy1lcaJ+xOZnFsGzPVGPoFgCiFTGDlDaHdZk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-dUQiW6J3Wycp5D3mAwGwruU6CkQ534OyP1GdsY7jzEw=";
|
||||
cargoHash = "sha256-VnkAokOC5xSqO7MVASssKs0EqQ+re5EsEar4eLspTSA=";
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ];
|
||||
|
||||
|
||||
@ -1,30 +1,22 @@
|
||||
{ lib, stdenv, fetchFromGitHub, ocaml, findlib }:
|
||||
{ lib, fetchFromGitHub, buildDunePackage }:
|
||||
|
||||
assert lib.versionAtLeast (lib.getVersion ocaml) "4.03.0";
|
||||
buildDunePackage rec {
|
||||
pname = "syslog";
|
||||
version = "2.0.2";
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ocaml${ocaml.version}-syslog";
|
||||
version = "1.5";
|
||||
minimalOCamlVersion = "4.03";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rixed";
|
||||
owner = "geneanet";
|
||||
repo = "ocaml-syslog";
|
||||
rev = "v${version}";
|
||||
sha256 = "1kqpc55ppzv9n555qgqpda49n7nvkqimzisyjx2a7338r7q4r5bw";
|
||||
hash = "sha256-WybNZBPhv4fhjzzb95E+6ZHcZUnfROLlNF3PMBGO9ys=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ ocaml findlib ];
|
||||
strictDeps = true;
|
||||
|
||||
buildFlags = [ "all" "opt" ];
|
||||
|
||||
createFindlibDestdir = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/rixed/ocaml-syslog";
|
||||
homepage = "https://github.com/geneanet/ocaml-syslog";
|
||||
description = "Simple wrapper to access the system logger from OCaml";
|
||||
license = licenses.lgpl21Plus;
|
||||
inherit (ocaml.meta) platforms;
|
||||
maintainers = [ maintainers.rixed ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -5,7 +5,6 @@
|
||||
, hatchling
|
||||
, hatch-jupyter-builder
|
||||
, jupyterlab
|
||||
, jupyter-packaging
|
||||
, ipywidgets
|
||||
, numpy
|
||||
, traitlets
|
||||
@ -15,7 +14,7 @@
|
||||
buildPythonPackage rec {
|
||||
pname = "bqscales";
|
||||
version = "0.3.3";
|
||||
format = "pyproject";
|
||||
pyproject = true;
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
@ -23,24 +22,10 @@ buildPythonPackage rec {
|
||||
hash = "sha256-SlnNw4dWOzRedwIN3kCyl95qVqkY92QGOMS3Eyoqk0I=";
|
||||
};
|
||||
|
||||
# We relax dependencies here instead of pulling in a patch because upstream
|
||||
# has released a new version using hatch-jupyter-builder, but it is not yet
|
||||
# trivial to upgrade to that.
|
||||
#
|
||||
# Per https://github.com/bqplot/bqscales/issues/76, jupyterlab is not needed
|
||||
# as a build dependency right now.
|
||||
#
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace '"jupyterlab==3.*",' "" \
|
||||
--replace 'jupyter_packaging~=' 'jupyter_packaging>='
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
hatch-jupyter-builder
|
||||
hatchling
|
||||
jupyterlab
|
||||
jupyter-packaging
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -50,6 +35,8 @@ buildPythonPackage rec {
|
||||
traittypes
|
||||
];
|
||||
|
||||
env.SKIP_JUPYTER_BUILDER = 1;
|
||||
|
||||
# no tests in PyPI dist
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "hahomematic";
|
||||
version = "2023.11.1";
|
||||
version = "2023.11.4";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
||||
owner = "danielperna84";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-C8KznmR3+G38MLQj6Sek7qW9R9yJr8gfcjgNjDyXG7I=";
|
||||
hash = "sha256-LB0BGj/DWjHGAFkyACkkzGY1oYNc7hJ2BeT1lHlNjqU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -34,14 +34,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jupyter-server";
|
||||
version = "2.7.3";
|
||||
version = "2.10.1";
|
||||
format = "pyproject";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "jupyter_server";
|
||||
inherit version;
|
||||
hash = "sha256-1JFshYHE67xTTOvaqOyiR42fO/3Yjq4p/KsBIOrFdkk=";
|
||||
hash = "sha256-5tomV6lUp4ee7SjMCOCBewH/2B1+q4Y0ZgOXtV+SZHI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -90,9 +90,9 @@ buildPythonPackage rec {
|
||||
'';
|
||||
|
||||
disabledTests = [
|
||||
"test_server_extension_list"
|
||||
"test_cull_idle"
|
||||
"test_server_extension_list"
|
||||
"test_subscribe_websocket"
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
# attempts to use trashcan, build env doesn't allow this
|
||||
"test_delete"
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pebble";
|
||||
version = "5.0.3";
|
||||
version = "5.0.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "Pebble";
|
||||
inherit version;
|
||||
hash = "sha256-vc/Z6n4K7biVsgQXfBnm1lQ9mWL040AuurIXUASGPag=";
|
||||
hash = "sha256-b3rfK97UQUvdNWLV9NVnvZT/EB5yav+HimZXW8mcEis=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
@ -32,6 +32,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "API to manage threads and processes within an application";
|
||||
homepage = "https://github.com/noxdafox/pebble";
|
||||
changelog = "https://github.com/noxdafox/pebble/releases/tag/${version}";
|
||||
license = licenses.lgpl3Plus;
|
||||
maintainers = with maintainers; [ orivej ];
|
||||
};
|
||||
|
||||
@ -38,6 +38,12 @@ buildPythonPackage rec {
|
||||
"tests"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# tests enum.IntFlag behaviour which has been disallowed in python 3.11.6
|
||||
# https://gitlab.com/dangass/plum/-/issues/150
|
||||
"tests/flag/test_flag_invalid.py"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Classes and utilities for packing/unpacking bytes";
|
||||
homepage = "https://plum-py.readthedocs.io/";
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
diff --git a/crates/polars-lazy/src/frame/mod.rs b/crates/polars-lazy/src/frame/mod.rs
|
||||
index 2d2ede651..be24b8809 100644
|
||||
--- a/crates/polars-lazy/src/frame/mod.rs
|
||||
+++ b/crates/polars-lazy/src/frame/mod.rs
|
||||
@@ -25,7 +25,7 @@ pub use parquet::*;
|
||||
use polars_core::frame::explode::MeltArgs;
|
||||
use polars_core::prelude::*;
|
||||
use polars_io::RowCount;
|
||||
-use polars_plan::dsl::all_horizontal;
|
||||
+use polars_plan::dsl::functions::all_horizontal;
|
||||
pub use polars_plan::frame::{AllowedOptimizations, OptState};
|
||||
use polars_plan::global::FETCH_ROWS;
|
||||
#[cfg(any(feature = "ipc", feature = "parquet", feature = "csv"))]
|
||||
@ -32,13 +32,6 @@ buildPythonPackage {
|
||||
disabled = pythonOlder "3.6";
|
||||
src = rootSource;
|
||||
|
||||
patches = [
|
||||
# workaround for apparent rustc bug
|
||||
# remove when we're at Rust 1.73
|
||||
# https://github.com/pola-rs/polars/issues/12050
|
||||
./all_horizontal.patch
|
||||
];
|
||||
|
||||
# Cargo.lock file is sometimes behind actual release which throws an error,
|
||||
# thus the `sed` command
|
||||
# Make sure to check that the right substitutions are made when updating the package
|
||||
|
||||
@ -10,14 +10,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "publicsuffixlist";
|
||||
version = "0.10.0.20231121";
|
||||
version = "0.10.0.20231122";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-6Jc12xQchyjXfI0kvvCCBGPNpivsz51izgS/41JrVnQ=";
|
||||
hash = "sha256-0CrHVPoQTS3I9ZPvf/4wWQX4vYn5vAeWUxNanjnbF60=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -20,14 +20,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytorch-lightning";
|
||||
version = "2.1.1";
|
||||
version = "2.1.2";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Lightning-AI";
|
||||
repo = "pytorch-lightning";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-1psTa++qF5WPDVXeDGWfcQ4hGz98uW297QDUKrQyoRE=";
|
||||
hash = "sha256-d5DKAx67uuIPxtSgazIQnxLiHTBD0lwHaB6LD3R6vKA=";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
|
||||
@ -15,14 +15,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "rollbar";
|
||||
version = "0.16.3";
|
||||
version = "1.0.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-AjE9/GBxDsc2qwM9D4yWnYV6i5kc1n4MGpFiDooE7eI=";
|
||||
hash = "sha256-Y0e35J8i8ClvwoemrqddZCz2RJTS7hJwQqelk8l9868=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -10,14 +10,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "trimesh";
|
||||
version = "4.0.1";
|
||||
version = "4.0.4";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-jBVQqYNB8P7E0xkcTH6uYmbBZ/l5P9VLtyyRQxq/fOY=";
|
||||
hash = "sha256-3XpncG6ISKQU+hqJpvck82s0BYgvYpNGn3zcdWkB5Ps=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
|
||||
@ -14,7 +14,7 @@ buildPythonPackage rec {
|
||||
|
||||
meta = {
|
||||
description = "This is a PEP 561 type stub package for the appdirs package. It can be used by type-checking tools like mypy, pyright, pytype, PyCharm, etc. to check code that uses appdirs. ";
|
||||
homepage = "https://pypi.org/project/types-appdirss";
|
||||
homepage = "https://pypi.org/project/types-appdirs";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
};
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "homeassistant-stubs";
|
||||
version = "2023.11.2";
|
||||
version = "2023.11.3";
|
||||
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-stVfFXb5QfC+wZUSk53+jt/hb8kO1gCcgeOnHHpNlWE=";
|
||||
hash = "sha256-x3FcUmbUYAUKGAPb85SqJk1kTWFKxpJSX2J+rTRj1KY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -16,13 +16,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "postgis";
|
||||
version = "3.4.0";
|
||||
version = "3.4.1";
|
||||
|
||||
outputs = [ "out" "doc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz";
|
||||
sha256 = "sha256-rum2CmyITTVBZLMJbEZX8yRFQYZgf4WdHOBdiZeYr50=";
|
||||
sha256 = "sha256-/vahQSE9D/J79FszuEnMOWwi3bH/xv7UNUacnokfyB0=";
|
||||
};
|
||||
|
||||
buildInputs = [ libxml2 postgresql geos proj gdal json_c protobufc pcre2.dev ]
|
||||
|
||||
@ -19,10 +19,14 @@ let
|
||||
hash = "sha256-i3zml6LyEnUqNcGsQURx3BbEJMlXO+SSa1b/P10jt68=";
|
||||
};
|
||||
});
|
||||
urllib3 = prev.urllib3.overridePythonAttrs (prev: {
|
||||
format = "setuptools";
|
||||
urllib3 = prev.urllib3.overridePythonAttrs (prev: rec {
|
||||
pyproject = true;
|
||||
version = "1.26.18";
|
||||
nativeBuildInputs = with final; [
|
||||
setuptools
|
||||
];
|
||||
src = prev.src.override {
|
||||
version = "1.26.18";
|
||||
inherit version;
|
||||
hash = "sha256-+OzBu6VmdBNFfFKauVW/jGe0XbeZ0VkGYmFxnjKFgKA=";
|
||||
};
|
||||
});
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "parallel";
|
||||
version = "20230922";
|
||||
version = "20231022";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/parallel/${pname}-${version}.tar.bz2";
|
||||
sha256 = "sha256-EUR0Ft1eXfZQE897RULhQJOKO/1fPzCVye2xaPy/4GM=";
|
||||
sha256 = "sha256-k/K5TxhQeYpLXdoiva6G2ramVl41JYYOCORvJWPzJow=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "man" "doc" ];
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubevirt";
|
||||
version = "1.0.1";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubevirt";
|
||||
repo = "kubevirt";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-L+spWtYuXq0bPYmE1eGnzTfCAh8Q3j5DUS+k6dNGdOU=";
|
||||
sha256 = "sha256-dW2rHW/37Jpk3vuu3O87nynK8Mp0IAqpkRvBDxT/++I=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@ -35407,7 +35407,7 @@ with pkgs;
|
||||
|
||||
maestral = with python3Packages; toPythonApplication maestral;
|
||||
|
||||
maestral-gui = libsForQt5.callPackage ../applications/networking/maestral-qt { };
|
||||
maestral-gui = qt6.callPackage ../applications/networking/maestral-qt { };
|
||||
|
||||
maestro = callPackage ../development/mobile/maestro { };
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user