b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse source
This commit is contained in:
github-actions[bot] 2023-06-08 18:02:03 +00:00 committed by GitHub
parent 69b154f738 09d33ac391
commit 52cf9e3e3b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
116 changed files with 2871 additions and 2159 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/contributing/coding-conventions.chapter.md
View file

@ -220,7 +220,9 @@ There are a few naming guidelines:
- The `version` attribute _must_ start with a digit e.g`"0.3.1rc2". - The `version` attribute _must_ start with a digit e.g`"0.3.1rc2".
- If a package is not a release but a commit from a repository, then the `version` attribute _must_ be the date of that (fetched) commit. The date _must_ be in `"unstable-YYYY-MM-DD"` format. - If a package is a commit from a repository without a version assigned, then the `version` attribute _should_ be the latest upstream version preceding that commit, followed by `-unstable-` and the date of the (fetched) commit. The date _must_ be in `"YYYY-MM-DD"` format.
Example: Given a project had its latest releases `2.2` in November 2021, and `3.0` in January 2022, a commit authored on March 15, 2022 for an upcoming bugfix release `2.2.1` would have `version = "2.2-unstable-2022-03-15"`.
- Dashes in the package `pname` _should_ be preserved in new variable names, rather than converted to underscores or camel cased — e.g., `http-parser` instead of `http_parser` or `httpParser`. The hyphenated style is preferred in all three package names. - Dashes in the package `pname` _should_ be preserved in new variable names, rather than converted to underscores or camel cased — e.g., `http-parser` instead of `http_parser` or `httpParser`. The hyphenated style is preferred in all three package names.

2
nixos/modules/config/users-groups.nix
View file

@ -652,7 +652,7 @@ in {
deps = [ "users" ]; deps = [ "users" ];
text = '' text = ''
users=() users=()
while IFS=: read -r user hash tail; do while IFS=: read -r user hash _; do
if [[ "$hash" = "$"* && ! "$hash" =~ ^\''$${cryptSchemeIdPatternGroup}\$ ]]; then if [[ "$hash" = "$"* && ! "$hash" =~ ^\''$${cryptSchemeIdPatternGroup}\$ ]]; then
users+=("$user") users+=("$user")
fi fi

6
nixos/modules/services/databases/foundationdb.md
View file

@ -6,7 +6,7 @@
*Maintainer:* Austin Seipp *Maintainer:* Austin Seipp
*Available version(s):* 5.1.x, 5.2.x, 6.0.x *Available version(s):* 7.1.x
FoundationDB (or "FDB") is an open source, distributed, transactional FoundationDB (or "FDB") is an open source, distributed, transactional
key-value store. key-value store.
@ -17,7 +17,7 @@ To enable FoundationDB, add the following to your
{file}`configuration.nix`: {file}`configuration.nix`:
``` ```
services.foundationdb.enable = true; services.foundationdb.enable = true;
services.foundationdb.package = pkgs.foundationdb52; # FoundationDB 5.2.x services.foundationdb.package = pkgs.foundationdb71; # FoundationDB 7.1.x
``` ```
The {option}`services.foundationdb.package` option is required, and The {option}`services.foundationdb.package` option is required, and
@ -66,7 +66,7 @@ necessary Python modules).
```ShellSession ```ShellSession
a@link> cat fdb-status.py a@link> cat fdb-status.py
#! /usr/bin/env nix-shell #! /usr/bin/env nix-shell
#! nix-shell -i python -p python pythonPackages.foundationdb52 #! nix-shell -i python -p python pythonPackages.foundationdb71
import fdb import fdb
import json import json

9
nixos/modules/system/activation/activation-script.nix
View file

@ -217,7 +217,8 @@ in
'' ''
# Various log/runtime directories. # Various log/runtime directories.
mkdir -m 1777 -p /var/tmp mkdir -p /var/tmp
chmod 1777 /var/tmp
# Empty, immutable home directory of many system accounts. # Empty, immutable home directory of many system accounts.
mkdir -p /var/empty mkdir -p /var/empty
@ -231,7 +232,8 @@ in
system.activationScripts.usrbinenv = if config.environment.usrbinenv != null system.activationScripts.usrbinenv = if config.environment.usrbinenv != null
then '' then ''
mkdir -m 0755 -p /usr/bin mkdir -p /usr/bin
chmod 0755 /usr/bin
ln -sfn ${config.environment.usrbinenv} /usr/bin/.env.tmp ln -sfn ${config.environment.usrbinenv} /usr/bin/.env.tmp
mv /usr/bin/.env.tmp /usr/bin/env # atomically replace /usr/bin/env mv /usr/bin/.env.tmp /usr/bin/env # atomically replace /usr/bin/env
'' ''
@ -251,7 +253,8 @@ in
if mountpoint -q "$mountPoint"; then if mountpoint -q "$mountPoint"; then
local options="remount,$options" local options="remount,$options"
else else
mkdir -m 0755 -p "$mountPoint" mkdir -p "$mountPoint"
chmod 0755 "$mountPoint"
fi fi
mount -t "$fsType" -o "$options" "$device" "$mountPoint" mount -t "$fsType" -o "$options" "$device" "$mountPoint"
} }

3
nixos/modules/system/boot/binfmt.nix
View file

@ -317,7 +317,8 @@ in {
environment.etc."binfmt.d/nixos.conf".source = builtins.toFile "binfmt_nixos.conf" environment.etc."binfmt.d/nixos.conf".source = builtins.toFile "binfmt_nixos.conf"
(lib.concatStringsSep "\n" (lib.mapAttrsToList makeBinfmtLine config.boot.binfmt.registrations)); (lib.concatStringsSep "\n" (lib.mapAttrsToList makeBinfmtLine config.boot.binfmt.registrations));
system.activationScripts.binfmt = stringAfter [ "specialfs" ] '' system.activationScripts.binfmt = stringAfter [ "specialfs" ] ''
mkdir -p -m 0755 /run/binfmt mkdir -p /run/binfmt
chmod 0755 /run/binfmt
${lib.concatStringsSep "\n" (lib.mapAttrsToList activationSnippet config.boot.binfmt.registrations)} ${lib.concatStringsSep "\n" (lib.mapAttrsToList activationSnippet config.boot.binfmt.registrations)}
''; '';
systemd = lib.mkIf (config.boot.binfmt.registrations != {}) { systemd = lib.mkIf (config.boot.binfmt.registrations != {}) {

3
nixos/tests/home-assistant.nix
View file

@ -62,7 +62,6 @@ in {
frontend = {}; frontend = {};
# include some popular integrations, that absolutely shouldn't break # include some popular integrations, that absolutely shouldn't break
esphome = {};
knx = {}; knx = {};
shelly = {}; shelly = {};
zha = {}; zha = {};
@ -198,7 +197,7 @@ in {
with subtest("Check that new components get setup after restart"): with subtest("Check that new components get setup after restart"):
journal = get_journal_since(cursor) journal = get_journal_since(cursor)
for domain in ["esphome"]: for domain in ["backup"]:
assert f"Setup of domain {domain} took" in journal, f"{domain} setup missing" assert f"Setup of domain {domain} took" in journal, f"{domain} setup missing"
with subtest("Check that no errors were logged"): with subtest("Check that no errors were logged"):

5
nixos/tests/initrd-luks-empty-passphrase.nix
View file

@ -18,6 +18,11 @@ in {
emptyDiskImages = [ 512 ]; emptyDiskImages = [ 512 ];
useBootLoader = true; useBootLoader = true;
useEFIBoot = true; useEFIBoot = true;
# This requires to have access
# to a host Nix store as
# the new root device is /dev/vdb
# an empty 512MiB drive, containing no Nix store.
mountHostNixStore = true;
}; };
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;

2
nixos/tests/luks.nix
View file

@ -7,6 +7,8 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: {
emptyDiskImages = [ 512 512 ]; emptyDiskImages = [ 512 512 ];
useBootLoader = true; useBootLoader = true;
useEFIBoot = true; useEFIBoot = true;
# To boot off the encrypted disk, we need to have a init script which comes from the Nix store
mountHostNixStore = true;
}; };
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;

2
nixos/tests/lvm2/systemd-stage-1.nix
View file

@ -65,6 +65,8 @@ in import ../make-test-python.nix ({ pkgs, ... }: {
emptyDiskImages = [ 8192 8192 ]; emptyDiskImages = [ 8192 8192 ];
useBootLoader = true; useBootLoader = true;
useEFIBoot = true; useEFIBoot = true;
# To boot off the LVM disk, we need to have a init script which comes from the Nix store.
mountHostNixStore = true;
}; };
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;

2
nixos/tests/systemd-initrd-btrfs-raid.nix
View file

@ -6,6 +6,8 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: {
virtualisation = { virtualisation = {
emptyDiskImages = [ 512 512 ]; emptyDiskImages = [ 512 512 ];
useBootLoader = true; useBootLoader = true;
# Booting off the BTRFS RAID requires an available init script from the Nix store
mountHostNixStore = true;
useEFIBoot = true; useEFIBoot = true;
}; };
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;

2
nixos/tests/systemd-initrd-luks-fido2.nix
View file

@ -6,6 +6,8 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: {
virtualisation = { virtualisation = {
emptyDiskImages = [ 512 ]; emptyDiskImages = [ 512 ];
useBootLoader = true; useBootLoader = true;
# Booting off the encrypted disk requires having a Nix store available for the init script
mountHostNixStore = true;
useEFIBoot = true; useEFIBoot = true;
qemu.package = lib.mkForce (pkgs.qemu_test.override { canokeySupport = true; }); qemu.package = lib.mkForce (pkgs.qemu_test.override { canokeySupport = true; });
qemu.options = [ "-device canokey,file=/tmp/canokey-file" ]; qemu.options = [ "-device canokey,file=/tmp/canokey-file" ];

2
nixos/tests/systemd-initrd-luks-keyfile.nix
View file

@ -14,6 +14,8 @@ in {
virtualisation = { virtualisation = {
emptyDiskImages = [ 512 ]; emptyDiskImages = [ 512 ];
useBootLoader = true; useBootLoader = true;
# Necessary to boot off the encrypted disk because it requires a init script coming from the Nix store
mountHostNixStore = true;
useEFIBoot = true; useEFIBoot = true;
}; };
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;

2
nixos/tests/systemd-initrd-luks-password.nix
View file

@ -6,6 +6,8 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: {
virtualisation = { virtualisation = {
emptyDiskImages = [ 512 512 ]; emptyDiskImages = [ 512 512 ];
useBootLoader = true; useBootLoader = true;
# Booting off the encrypted disk requires an available init script
mountHostNixStore = true;
useEFIBoot = true; useEFIBoot = true;
}; };
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;

2
nixos/tests/systemd-initrd-luks-tpm2.nix
View file

@ -6,6 +6,8 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: {
virtualisation = { virtualisation = {
emptyDiskImages = [ 512 ]; emptyDiskImages = [ 512 ];
useBootLoader = true; useBootLoader = true;
# Booting off the TPM2-encrypted device requires an available init script
mountHostNixStore = true;
useEFIBoot = true; useEFIBoot = true;
qemu.options = ["-chardev socket,id=chrtpm,path=/tmp/mytpm1/swtpm-sock -tpmdev emulator,id=tpm0,chardev=chrtpm -device tpm-tis,tpmdev=tpm0"]; qemu.options = ["-chardev socket,id=chrtpm,path=/tmp/mytpm1/swtpm-sock -tpmdev emulator,id=tpm0,chardev=chrtpm -device tpm-tis,tpmdev=tpm0"];
}; };

8
nixos/tests/systemd-initrd-networkd-ssh.nix
View file

@ -10,13 +10,15 @@ import ./make-test-python.nix ({ lib, ... }: {
virtualisation = { virtualisation = {
emptyDiskImages = [ 4096 ]; emptyDiskImages = [ 4096 ];
useBootLoader = true; useBootLoader = true;
# Booting off the encrypted disk requires an available init script from the Nix store
mountHostNixStore = true;
useEFIBoot = true; useEFIBoot = true;
}; };
specialisation.encrypted-root.configuration = { specialisation.encrypted-root.configuration = {
virtualisation.bootDevice = "/dev/mapper/root"; virtualisation.rootDevice = "/dev/mapper/root";
boot.initrd.luks.devices = lib.mkVMOverride { boot.initrd.luks.devices = lib.mkVMOverride {
root.device = "/dev/vdc"; root.device = "/dev/vdb";
}; };
boot.initrd.systemd.enable = true; boot.initrd.systemd.enable = true;
boot.initrd.network = { boot.initrd.network = {
@ -61,7 +63,7 @@ import ./make-test-python.nix ({ lib, ... }: {
server.wait_for_unit("multi-user.target") server.wait_for_unit("multi-user.target")
server.succeed( server.succeed(
"echo somepass | cryptsetup luksFormat --type=luks2 /dev/vdc", "echo somepass | cryptsetup luksFormat --type=luks2 /dev/vdb",
"bootctl set-default nixos-generation-1-specialisation-encrypted-root.conf", "bootctl set-default nixos-generation-1-specialisation-encrypted-root.conf",
"sync", "sync",
) )

2
nixos/tests/systemd-initrd-swraid.nix
View file

@ -6,6 +6,8 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: {
virtualisation = { virtualisation = {
emptyDiskImages = [ 512 512 ]; emptyDiskImages = [ 512 512 ];
useBootLoader = true; useBootLoader = true;
# Booting off the RAID requires an available init script
mountHostNixStore = true;
useEFIBoot = true; useEFIBoot = true;
}; };
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;

6
pkgs/applications/backup/ludusavi/default.nix
View file

@ -18,16 +18,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "ludusavi"; pname = "ludusavi";
version = "0.17.1"; version = "0.19.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mtkennerly"; owner = "mtkennerly";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-LTqorrZ7hp9hFGcQ0rdc/U6st9YraXEftDpH7VEShs8="; hash = "sha256-1Na+xGcb15/ZRbuy96qJwPg6Zo7FsGwCUXD3XgzWXo0=";
}; };
cargoSha256 = "sha256-3SijgvIPb+QBAWZaTivw8P5aYjctGfgnVrFYcGl8PyE="; cargoSha256 = "sha256-JjeOODm5xsRM5cJgCDb89cN60SuEeDzTVe6siKVDdcU=";
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake

69
pkgs/applications/editors/thiefmd/default.nix
View file

@ -1,46 +1,69 @@
{ lib, stdenv, fetchFromGitHub, wrapGAppsHook, cmake, desktop-file-utils, glib { lib
, meson, ninja, pkg-config, vala, clutter, discount, gtk3, gtksourceview4, gtkspell3 , stdenv
, libarchive, libgee, libhandy, libsecret, link-grammar, webkitgtk }: , fetchFromGitHub
, meson
, ninja
, vala
, pkg-config
, wrapGAppsHook
, desktop-file-utils
, discount
, glib
, gtk3
, gtksourceview4
, gtkspell3
, json-glib
, libarchive
, libgee
, libhandy
, libsecret
, libxml2
, link-grammar
, webkitgtk_4_1
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "thiefmd"; pname = "thiefmd";
version = "0.2.5-stability"; version = "0.2.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kmwallio"; owner = "kmwallio";
repo = "ThiefMD"; repo = "ThiefMD";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-cUZ7NVGe4e9ZISo9gjWFuDNCyF3rsQtrDX+ureyqtwM="; hash = "sha256-noNfGFMeIyKhAgiovJDn91TLELAOQ4nD/5QlQfsKTII=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
nativeBuildInputs = [ nativeBuildInputs = [
cmake desktop-file-utils glib meson wrapGAppsHook meson
ninja pkg-config vala ninja
vala
pkg-config
wrapGAppsHook
desktop-file-utils
]; ];
buildInputs = [ buildInputs = [
clutter discount gtk3 gtksourceview4 gtkspell3 discount # libmarkdown
libarchive libgee libhandy libsecret link-grammar glib
webkitgtk gtk3
gtksourceview4
gtkspell3
json-glib
libarchive
libgee
libhandy
libsecret
libxml2
link-grammar
webkitgtk_4_1
]; ];
dontUseCmakeConfigure = true;
postInstall = ''
mv $out/share/applications/com.github.kmwallio.thiefmd.desktop \
$out/share/applications/thiefmd.desktop
substituteInPlace $out/share/applications/thiefmd.desktop \
--replace 'Exec=com.github.kmwallio.' Exec=$out/bin/
makeWrapper $out/bin/com.github.kmwallio.thiefmd \
$out/bin/thiefmd \
--prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/"
'';
meta = with lib; { meta = with lib; {
description = "Markdown & Fountain editor that helps with organization and management"; description = "Markdown & Fountain editor that helps with organization and management";
homepage = "https://thiefmd.com"; homepage = "https://thiefmd.com";
downloadPage = "https://github.com/kmwallio/ThiefMD";
mainProgram = "com.github.kmwallio.thiefmd";
license = licenses.gpl3Only; license = licenses.gpl3Only;
platforms = platforms.linux; platforms = platforms.linux;
maintainers = with maintainers; [ wolfangaukang ]; maintainers = with maintainers; [ wolfangaukang ];

114
pkgs/applications/editors/vim/plugins/generated.nix
View file

@ -173,12 +173,12 @@ final: prev:
LazyVim = buildVimPluginFrom2Nix { LazyVim = buildVimPluginFrom2Nix {
pname = "LazyVim"; pname = "LazyVim";
version = "2023-06-05"; version = "2023-06-06";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "LazyVim"; owner = "LazyVim";
repo = "LazyVim"; repo = "LazyVim";
rev = "56f092f1a8f37036253a5c1f1253d0eebac6dd61"; rev = "0731f08ee43138b61eaf02ac00110babf61be99d";
sha256 = "1bf2dsy1xgxzi9fb49jgqk6pqx68079lakaa4x0slaij0k0hlvi5"; sha256 = "1rkb321a8za0dp12vln131kc420al620v2c36n00kj2xk19qlk75";
}; };
meta.homepage = "https://github.com/LazyVim/LazyVim/"; meta.homepage = "https://github.com/LazyVim/LazyVim/";
}; };
@ -2431,12 +2431,12 @@ final: prev:
dart-vim-plugin = buildVimPluginFrom2Nix { dart-vim-plugin = buildVimPluginFrom2Nix {
pname = "dart-vim-plugin"; pname = "dart-vim-plugin";
version = "2022-05-23"; version = "2023-06-05";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "dart-lang"; owner = "dart-lang";
repo = "dart-vim-plugin"; repo = "dart-vim-plugin";
rev = "81e50e80329e5eac2c115f45585b1838a614d07a"; rev = "0ba32c911178e6701d3f76d754c8138a7c7c2e6f";
sha256 = "0xi8iv3ycam3ypcxl0zn418qi2m1g0zcbfj6zvdbnfbi0nbqwj9n"; sha256 = "0qz1d0immg9wc9ccqkn2i558jpv0v96g8zn7kd26dc3j1j64lpd4";
}; };
meta.homepage = "https://github.com/dart-lang/dart-vim-plugin/"; meta.homepage = "https://github.com/dart-lang/dart-vim-plugin/";
}; };
@ -2959,6 +2959,18 @@ final: prev:
meta.homepage = "https://github.com/edgedb/edgedb-vim/"; meta.homepage = "https://github.com/edgedb/edgedb-vim/";
}; };
edgy-nvim = buildVimPluginFrom2Nix {
pname = "edgy.nvim";
version = "2023-06-06";
src = fetchFromGitHub {
owner = "folke";
repo = "edgy.nvim";
rev = "cb82974725e7730c847a5764f51da4b84361b502";
sha256 = "1ha7sqcbjf9jmiscqgd513fwp6x3pigrcb2l75jnx1nhh6nc1zxm";
};
meta.homepage = "https://github.com/folke/edgy.nvim/";
};
editorconfig-vim = buildVimPluginFrom2Nix { editorconfig-vim = buildVimPluginFrom2Nix {
pname = "editorconfig-vim"; pname = "editorconfig-vim";
version = "2023-03-22"; version = "2023-03-22";
@ -3839,12 +3851,12 @@ final: prev:
haskell-tools-nvim = buildNeovimPluginFrom2Nix { haskell-tools-nvim = buildNeovimPluginFrom2Nix {
pname = "haskell-tools.nvim"; pname = "haskell-tools.nvim";
version = "2023-06-04"; version = "2023-06-05";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "MrcJkb"; owner = "MrcJkb";
repo = "haskell-tools.nvim"; repo = "haskell-tools.nvim";
rev = "33bac7b297df2b16df82f1465decfa13069b1ce1"; rev = "c8084560f5d449053b8d13d0a21ef0c7619fd886";
sha256 = "1r82ykba0nzyja8kgrk770895ihbggn6c839c3sbgn0vc8drc0np"; sha256 = "05w403gc8p3c4c7n1485dn9zqzz12jx3c00g07pc0j5623a3idip";
}; };
meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/";
}; };
@ -4439,12 +4451,12 @@ final: prev:
lazy-nvim = buildVimPluginFrom2Nix { lazy-nvim = buildVimPluginFrom2Nix {
pname = "lazy.nvim"; pname = "lazy.nvim";
version = "2023-06-03"; version = "2023-06-06";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "folke"; owner = "folke";
repo = "lazy.nvim"; repo = "lazy.nvim";
rev = "f145e6f42a56306c5536e9efbfe41f7efbec285d"; rev = "ae25448d39fb2bdc38a139339233270edec44484";
sha256 = "0dllxvrnyfxij710lkwq99m4vfwsabnh47dx4nrl5x0gbplaw6m9"; sha256 = "03vdi199hxngfmkaizqgdwh7vxg86pw0ngmmv87vx8hnl9il8gps";
}; };
meta.homepage = "https://github.com/folke/lazy.nvim/"; meta.homepage = "https://github.com/folke/lazy.nvim/";
}; };
@ -5555,12 +5567,12 @@ final: prev:
neodev-nvim = buildVimPluginFrom2Nix { neodev-nvim = buildVimPluginFrom2Nix {
pname = "neodev.nvim"; pname = "neodev.nvim";
version = "2023-06-04"; version = "2023-06-06";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "folke"; owner = "folke";
repo = "neodev.nvim"; repo = "neodev.nvim";
rev = "91bebf70e2c50c1d298752b74a34ca9da3c04f85"; rev = "1dffaffd6eadd39daba4a102d1ead42dd198e2c2";
sha256 = "1mz33za6a1vrvbx7bxw497bzpmhnwgiandmgg3xhr6zjym22kzvk"; sha256 = "1146pjml56rgis3waxha40dlg0r3a3d5n65mim9jac9l91pbl76y";
}; };
meta.homepage = "https://github.com/folke/neodev.nvim/"; meta.homepage = "https://github.com/folke/neodev.nvim/";
}; };
@ -5651,12 +5663,12 @@ final: prev:
neorg = buildVimPluginFrom2Nix { neorg = buildVimPluginFrom2Nix {
pname = "neorg"; pname = "neorg";
version = "2023-06-05"; version = "2023-06-06";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nvim-neorg"; owner = "nvim-neorg";
repo = "neorg"; repo = "neorg";
rev = "45efa0e606cd403fead47dd7b199f6b5c9a0a68b"; rev = "474af829b0f3e25e09e68d2842ffcb6ca24d359b";
sha256 = "09754m3r6yz563sl1g100cxpzf8pz6cpikhqznn5xalv1d7c10si"; sha256 = "054901bdaw6a0aqwdxbm66cii0h03inyrww7k0dw6ahbni7rswgp";
}; };
meta.homepage = "https://github.com/nvim-neorg/neorg/"; meta.homepage = "https://github.com/nvim-neorg/neorg/";
}; };
@ -6083,12 +6095,12 @@ final: prev:
nlsp-settings-nvim = buildVimPluginFrom2Nix { nlsp-settings-nvim = buildVimPluginFrom2Nix {
pname = "nlsp-settings.nvim"; pname = "nlsp-settings.nvim";
version = "2023-06-04"; version = "2023-06-06";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tamago324"; owner = "tamago324";
repo = "nlsp-settings.nvim"; repo = "nlsp-settings.nvim";
rev = "f6e8784d53908060b507a777c57449b472fbae97"; rev = "8f136a9e341b8ef9d306d8ed378f023f179c9501";
sha256 = "0p8l1gwphc8d6z5yyb95i3p800sbdh9p3ha2kinfxmk978jf0a2y"; sha256 = "0ca15pxv66k7hvfwd8cg9wf44075n3m353mqm7q86dr041f5zhc8";
}; };
meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/"; meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/";
}; };
@ -6131,12 +6143,12 @@ final: prev:
noice-nvim = buildVimPluginFrom2Nix { noice-nvim = buildVimPluginFrom2Nix {
pname = "noice.nvim"; pname = "noice.nvim";
version = "2023-06-04"; version = "2023-06-06";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "folke"; owner = "folke";
repo = "noice.nvim"; repo = "noice.nvim";
rev = "7b14678f83ad1a875b1bcea34de4377ebfb50973"; rev = "acf47e2b863eb20f177aa1bd5398041513e731e1";
sha256 = "05y8lz4r4rmjbnma7zv3fz0lknlgby6385sai92zkh5a959bj51x"; sha256 = "1w4vzkashi7yqkzgb9cdq7nv27ibkw94ih041jf36k9axmlffqbr";
}; };
meta.homepage = "https://github.com/folke/noice.nvim/"; meta.homepage = "https://github.com/folke/noice.nvim/";
}; };
@ -6191,12 +6203,12 @@ final: prev:
null-ls-nvim = buildVimPluginFrom2Nix { null-ls-nvim = buildVimPluginFrom2Nix {
pname = "null-ls.nvim"; pname = "null-ls.nvim";
version = "2023-05-30"; version = "2023-06-06";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jose-elias-alvarez"; owner = "jose-elias-alvarez";
repo = "null-ls.nvim"; repo = "null-ls.nvim";
rev = "c89333e034a8daba654ebfcf9a4ec9f87765f01e"; rev = "a138b14099e9623832027ea12b4631ddd2a49256";
sha256 = "1kpyh1y5p0cazbvcm9cazkc93giqbbngm9zk1pf5qxrl18217cqh"; sha256 = "1jgsh1jkyxfj6cjz9sh4b80k83nlqi83kbd1c7jnqz5x98lybi1p";
}; };
meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/";
}; };
@ -6359,12 +6371,12 @@ final: prev:
nvim-cokeline = buildVimPluginFrom2Nix { nvim-cokeline = buildVimPluginFrom2Nix {
pname = "nvim-cokeline"; pname = "nvim-cokeline";
version = "2023-06-03"; version = "2023-06-06";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "willothy"; owner = "willothy";
repo = "nvim-cokeline"; repo = "nvim-cokeline";
rev = "dce9f06d939b85abb5222939874343e3100a4c0d"; rev = "7fb6753c8fb90eebb6b56f86fc6e65468a23c81c";
sha256 = "1vbv63klkzcl2szz146f8251xc60px0yfsh3i79cbaknrskmmj8d"; sha256 = "18japvpc1rrvsb6ycjzixqgrcabwyd8aq94a35k271liyk3i5i7g";
}; };
meta.homepage = "https://github.com/willothy/nvim-cokeline/"; meta.homepage = "https://github.com/willothy/nvim-cokeline/";
}; };
@ -6695,12 +6707,12 @@ final: prev:
nvim-lspconfig = buildVimPluginFrom2Nix { nvim-lspconfig = buildVimPluginFrom2Nix {
pname = "nvim-lspconfig"; pname = "nvim-lspconfig";
version = "2023-06-05"; version = "2023-06-06";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "neovim"; owner = "neovim";
repo = "nvim-lspconfig"; repo = "nvim-lspconfig";
rev = "664de12a7816dfa348bb475607edfa4fe0122025"; rev = "00d7063cdca8d39eb4e3308277cc21eae7bb44f7";
sha256 = "0f2068l6kcrxxvk9wk8gxswqj0f3f6w6dm1nzmbcvqv4j5mvwnps"; sha256 = "0s4lwpafikfjl4kbp7dpll0akz1ir11bw5zgcy2zll2z2zdsb447";
}; };
meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
}; };
@ -6899,12 +6911,12 @@ final: prev:
nvim-scrollview = buildVimPluginFrom2Nix { nvim-scrollview = buildVimPluginFrom2Nix {
pname = "nvim-scrollview"; pname = "nvim-scrollview";
version = "2023-06-05"; version = "2023-06-06";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "dstein64"; owner = "dstein64";
repo = "nvim-scrollview"; repo = "nvim-scrollview";
rev = "b0aee8d8a8ec4bb4b1d8152b8748ae6da37cd39c"; rev = "b4a7bb3f54e180e6203071ffa80f375bef9239fd";
sha256 = "1fphw6g9h2b3dk8xxjvmyxhcmw7b27y0jq0g3ybx9wnqac3w06m0"; sha256 = "014bis349y6j2ll17xbanikcaw0v54yiz69pi8k1pmkif7n08c6d";
}; };
meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; meta.homepage = "https://github.com/dstein64/nvim-scrollview/";
}; };
@ -8982,12 +8994,12 @@ final: prev:
telescope-manix = buildNeovimPluginFrom2Nix { telescope-manix = buildNeovimPluginFrom2Nix {
pname = "telescope-manix"; pname = "telescope-manix";
version = "2023-05-29"; version = "2023-06-05";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "MrcJkb"; owner = "MrcJkb";
repo = "telescope-manix"; repo = "telescope-manix";
rev = "86f40f1d562e344851e2d9df853c8f058db33c38"; rev = "3930d658899dff2c796d8a5b488f7cc77a08d966";
sha256 = "0br5naafzrzrmr4qzdhl6j8557c4m4d6agqzphn9fcd8q6faphk8"; sha256 = "030v85lihjhvma9m22j1xc37wm06g4jkmhlmxpv1hsafff8cmxhq";
}; };
meta.homepage = "https://github.com/MrcJkb/telescope-manix/"; meta.homepage = "https://github.com/MrcJkb/telescope-manix/";
}; };
@ -9524,12 +9536,12 @@ final: prev:
typescript-nvim = buildVimPluginFrom2Nix { typescript-nvim = buildVimPluginFrom2Nix {
pname = "typescript.nvim"; pname = "typescript.nvim";
version = "2023-01-03"; version = "2023-06-06";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jose-elias-alvarez"; owner = "jose-elias-alvarez";
repo = "typescript.nvim"; repo = "typescript.nvim";
rev = "f66d4472606cb24615dfb7dbc6557e779d177624"; rev = "5b3680e5c386e8778c081173ea0c978c14a40ccb";
sha256 = "1hm87jpscv250x8hv3vacw0sdhkwa81x21cxyvc6nf2vsbj5hx9w"; sha256 = "0ixxgbcz8y42xlbin2dv3ycrlrgjd53shi9i8iyy0kxpr57cjldz";
}; };
meta.homepage = "https://github.com/jose-elias-alvarez/typescript.nvim/"; meta.homepage = "https://github.com/jose-elias-alvarez/typescript.nvim/";
}; };
@ -11432,12 +11444,12 @@ final: prev:
vim-gruvbox8 = buildVimPluginFrom2Nix { vim-gruvbox8 = buildVimPluginFrom2Nix {
pname = "vim-gruvbox8"; pname = "vim-gruvbox8";
version = "2023-06-05"; version = "2023-06-06";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lifepillar"; owner = "lifepillar";
repo = "vim-gruvbox8"; repo = "vim-gruvbox8";
rev = "6bf129b4d65fad40ce4317f0ac34f9708afc7f0e"; rev = "75614aff9669abd7f8b0aae58fdfbaddfebee1e0";
sha256 = "00i8xfbzjs8d0fpmsvrysc1p6hnk6z95d61q7nc1hkx14hlc5w0l"; sha256 = "0bszxd8f0qyydx0w9dff46spc36s35jdpgshr616wlfwpgi4l1z4";
}; };
meta.homepage = "https://github.com/lifepillar/vim-gruvbox8/"; meta.homepage = "https://github.com/lifepillar/vim-gruvbox8/";
}; };
@ -13607,12 +13619,12 @@ final: prev:
vim-solarized8 = buildVimPluginFrom2Nix { vim-solarized8 = buildVimPluginFrom2Nix {
pname = "vim-solarized8"; pname = "vim-solarized8";
version = "2023-06-02"; version = "2023-06-06";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lifepillar"; owner = "lifepillar";
repo = "vim-solarized8"; repo = "vim-solarized8";
rev = "2b5bad7944c6990a8dd31ff519268b174b587a70"; rev = "77a6bd78a6f1f8b6f841fc7e1ea427b2348ac1b7";
sha256 = "1z45y9cvkavffb8hjj9gq2r2hlha9v0g7cijcirpa7rlpz486qm3"; sha256 = "072y01039s2gimnsvibwfb499r0wqbwqk7n8ykqilf6y298r1m2g";
}; };
meta.homepage = "https://github.com/lifepillar/vim-solarized8/"; meta.homepage = "https://github.com/lifepillar/vim-solarized8/";
}; };
@ -15110,12 +15122,12 @@ final: prev:
lspsaga-nvim-original = buildVimPluginFrom2Nix { lspsaga-nvim-original = buildVimPluginFrom2Nix {
pname = "lspsaga-nvim-original"; pname = "lspsaga-nvim-original";
version = "2023-06-01"; version = "2023-06-06";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nvimdev"; owner = "nvimdev";
repo = "lspsaga.nvim"; repo = "lspsaga.nvim";
rev = "c475ace5b8882631b351ef7c3e8078ca9ebbb751"; rev = "4f075452c466df263e69ae142f6659dcf9324bf6";
sha256 = "1dg96sg0262nm2rzq6h80f51grc4www7ljcx6c7j3l8p0c003gha"; sha256 = "0p7lqf8562z7wnjiijniqs9pn36n16gywpm940lbz724g5lykm4q";
}; };
meta.homepage = "https://github.com/nvimdev/lspsaga.nvim/"; meta.homepage = "https://github.com/nvimdev/lspsaga.nvim/";
}; };

1
pkgs/applications/editors/vim/plugins/vim-plugin-names
View file

@ -247,6 +247,7 @@ https://github.com/stevearc/dressing.nvim/,,
https://github.com/Shougo/echodoc.vim/,, https://github.com/Shougo/echodoc.vim/,,
https://github.com/sainnhe/edge/,, https://github.com/sainnhe/edge/,,
https://github.com/edgedb/edgedb-vim/,, https://github.com/edgedb/edgedb-vim/,,
https://github.com/folke/edgy.nvim/,HEAD,
https://github.com/editorconfig/editorconfig-vim/,, https://github.com/editorconfig/editorconfig-vim/,,
https://github.com/gpanders/editorconfig.nvim/,, https://github.com/gpanders/editorconfig.nvim/,,
https://github.com/elixir-tools/elixir-tools.nvim/,HEAD, https://github.com/elixir-tools/elixir-tools.nvim/,HEAD,

108
pkgs/applications/emulators/pcsx2/default.nix
View file

@ -1,90 +1,110 @@
{ alsa-lib { cmake
, cmake
, fetchFromGitHub , fetchFromGitHub
, lib
, stdenv
, curl
, ffmpeg
, fmt , fmt
, gettext , gettext
, glib
, gtk3
, harfbuzz , harfbuzz
, lib
, libaio , libaio
, libbacktrace
, libpcap , libpcap
, libpng
, libpulseaudio , libpulseaudio
, libsamplerate , libsamplerate
, libXdmcp , libXrandr
, openssl , libzip
, pcre
, perl
, pkg-config , pkg-config
, portaudio , qtbase
, qtsvg
, qttools
, qttranslations
, qtwayland
, rapidyaml
, SDL2 , SDL2
, soundtouch , soundtouch
, stdenv
, udev
, vulkan-headers , vulkan-headers
, vulkan-loader , vulkan-loader
, wrapGAppsHook
, wxGTK
, zlib
, wayland , wayland
, wrapQtAppsHook
, xz
, zip
}: }:
let
# The pre-zipped files in releases don't have a versioned link, we need to zip them ourselves
pcsx2_patches = fetchFromGitHub {
owner = "PCSX2";
repo = "pcsx2_patches";
rev = "8db5ae467a35cc00dc50a65061aa78dc5115e6d1";
sha256 = "sha256-68kD7IAhBMASFmkGwvyQ7ppO/3B1csAKik+rU792JI4=";
};
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "pcsx2"; pname = "pcsx2";
version = "1.7.3331"; version = "1.7.4554";
# nixpkgs-update: no auto update
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "PCSX2"; owner = "PCSX2";
repo = "pcsx2"; repo = "pcsx2";
fetchSubmodules = true; fetchSubmodules = true;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-0RcmBMxKj/gnkNEjn2AUSSO1DzyNSf1lOZWPSUq6764="; sha256 = "sha256-9MRbpm7JdVmZwv8zD4lErzVTm7A4tYM0FgXE9KpX+/8=";
}; };
cmakeFlags = [ cmakeFlags = [
"-DDISABLE_ADVANCE_SIMD=TRUE" "-DDISABLE_ADVANCE_SIMD=TRUE"
"-DDISABLE_PCSX2_WRAPPER=TRUE" "-DUSE_SYSTEM_LIBS=ON"
"-DPACKAGE_MODE=TRUE" "-DDISABLE_BUILD_DATE=TRUE"
"-DWAYLAND_API=TRUE"
"-DXDG_STD=TRUE"
"-DUSE_VULKAN=TRUE"
]; ];
nativeBuildInputs = [ cmake perl pkg-config vulkan-headers wrapGAppsHook ]; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook zip ];
buildInputs = [ buildInputs = [
alsa-lib curl
ffmpeg
fmt fmt
gettext gettext
glib
gtk3
harfbuzz harfbuzz
libaio libaio
libbacktrace
libpcap libpcap
libpng
libpulseaudio libpulseaudio
libsamplerate libsamplerate
libXdmcp libXrandr
openssl libzip
pcre qtbase
portaudio qtsvg
qttools
qttranslations
qtwayland
rapidyaml
SDL2 SDL2
soundtouch soundtouch
udev vulkan-headers
vulkan-loader vulkan-loader
wayland wayland
wxGTK xz
zlib
]; ];
preFixup = '' installPhase = ''
gappsWrapperArgs+=( mkdir -p $out/bin
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ vulkan-loader ]} cp -a bin/pcsx2-qt bin/resources $out/bin/
)
install -Dm644 $src/pcsx2/Resources/AppIcon64.png $out/share/pixmaps/PCSX2.png
install -Dm644 $src/.github/workflows/scripts/linux/pcsx2-qt.desktop $out/share/applications/PCSX2.desktop
zip -jq $out/bin/resources/patches.zip ${pcsx2_patches}/patches/*
''; '';
qtWrapperArgs = [
"--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [
ffmpeg # It's loaded with dlopen. They plan to change it https://github.com/PCSX2/pcsx2/issues/8624
libpulseaudio
vulkan-loader
]}"
];
meta = with lib; { meta = with lib; {
description = "Playstation 2 emulator"; description = "Playstation 2 emulator";
longDescription = '' longDescription = ''
@ -95,13 +115,9 @@ stdenv.mkDerivation rec {
PC, with many additional features and benefits. PC, with many additional features and benefits.
''; '';
homepage = "https://pcsx2.net"; homepage = "https://pcsx2.net";
license = with licenses; [ gpl3 lgpl3 ];
maintainers = with maintainers; [ hrdinka govanify ]; maintainers = with maintainers; [ hrdinka govanify ];
mainProgram = "pcsx2-qt";
# PCSX2's source code is released under LGPLv3+. It However ships
# additional data files and code that are licensed differently.
# This might be solved in future, for now we should stick with
# license.free
license = licenses.free;
platforms = platforms.x86_64; platforms = platforms.x86_64;
}; };
} }

2
pkgs/applications/kde/angelfish.nix
View file

@ -22,7 +22,7 @@
, srcs , srcs
# provided as callPackage input to enable easier overrides through overlays # provided as callPackage input to enable easier overrides through overlays
, cargoSha256 ? "sha256-whMfpElpFB7D+dHHJrbwINFL4bVpHTlcZX+mdBfiqEE=" , cargoSha256 ? "sha256-Cgcat/ZJH8I/RzUVWaO24R2lh+tB5foqDnH8Yjs4K1k="
}: }:
mkDerivation rec { mkDerivation rec {

2
pkgs/applications/kde/fetch.sh
View file

@ -1 +1 @@
WGET_ARGS=( https://download.kde.org/stable/release-service/23.04.1/src -A '*.tar.xz' ) WGET_ARGS=( https://download.kde.org/stable/release-service/23.04.2/src -A '*.tar.xz' )

2048
pkgs/applications/kde/srcs.nix
View file

File diff suppressed because it is too large Load diff

6
pkgs/applications/misc/ArchiSteamFarm/default.nix
View file

@ -1,5 +1,4 @@
{ lib { lib
, stdenv
, buildDotnetModule , buildDotnetModule
, fetchFromGitHub , fetchFromGitHub
, dotnetCorePackages , dotnetCorePackages
@ -7,19 +6,18 @@
, zlib , zlib
, openssl , openssl
, callPackage , callPackage
, stdenvNoCC
}: }:
buildDotnetModule rec { buildDotnetModule rec {
pname = "archisteamfarm"; pname = "archisteamfarm";
# nixpkgs-update: no auto update # nixpkgs-update: no auto update
version = "5.4.5.2"; version = "5.4.6.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "justarchinet"; owner = "justarchinet";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-l3qcdgTTpbI4Jdy1jpzyCiAFglJfzBHkb6hLIZ4hDKQ="; hash = "sha256-TAGb3LPS0Jpm3dGGkQbrtTBFCE/xos2ZbNq5UwnrGZY=";
}; };
dotnet-runtime = dotnetCorePackages.aspnetcore_7_0; dotnet-runtime = dotnetCorePackages.aspnetcore_7_0;

12
pkgs/applications/misc/ArchiSteamFarm/deps.nix generated
View file

@ -61,7 +61,7 @@
(fetchNuGet { pname = "Microsoft.AspNetCore.JsonPatch"; version = "7.0.0"; sha256 = "1f13vsfs1rp9bmdp3khk4mk2fif932d72yxm2wszpsr239x4s2bf"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.JsonPatch"; version = "7.0.0"; sha256 = "1f13vsfs1rp9bmdp3khk4mk2fif932d72yxm2wszpsr239x4s2bf"; })
(fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; version = "7.0.0"; sha256 = "1w49rg0n5wb1m5wnays2mmym7qy7bsi2b1zxz97af2rkbw3s3hbd"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; version = "7.0.0"; sha256 = "1w49rg0n5wb1m5wnays2mmym7qy7bsi2b1zxz97af2rkbw3s3hbd"; })
(fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; })
(fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.5.0"; sha256 = "0briw00gb5bz9k9kx00p6ghq47w501db7gb6ig5zzmz9hb8lw4a4"; }) (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.6.0"; sha256 = "02s98d8nwz5mg4mymcr86qdamy71a29g2091xg452czmd3s3x2di"; })
(fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; })
(fetchNuGet { pname = "Microsoft.Extensions.ApiDescription.Server"; version = "6.0.5"; sha256 = "1pi2bm3cm0a7jzqzmfc2r7bpcdkmk3hhjfvb2c81j7wl7xdw3624"; }) (fetchNuGet { pname = "Microsoft.Extensions.ApiDescription.Server"; version = "6.0.5"; sha256 = "1pi2bm3cm0a7jzqzmfc2r7bpcdkmk3hhjfvb2c81j7wl7xdw3624"; })
(fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "6.0.0"; sha256 = "0w6wwxv12nbc3sghvr68847wc9skkdgsicrz3fx4chgng1i3xy0j"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "6.0.0"; sha256 = "0w6wwxv12nbc3sghvr68847wc9skkdgsicrz3fx4chgng1i3xy0j"; })
@ -71,14 +71,14 @@
(fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "6.0.0"; sha256 = "0b75fmins171zi6bfdcq1kcvyrirs8n91mknjnxy4c3ygi1rrnj0"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "6.0.0"; sha256 = "0b75fmins171zi6bfdcq1kcvyrirs8n91mknjnxy4c3ygi1rrnj0"; })
(fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "6.0.0"; sha256 = "008pnk2p50i594ahz308v81a41mbjz9mwcarqhmrjpl2d20c868g"; }) (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "6.0.0"; sha256 = "008pnk2p50i594ahz308v81a41mbjz9mwcarqhmrjpl2d20c868g"; })
(fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "6.0.0"; sha256 = "1kjiw6s4yfz9gm7mx3wkhp06ghnbs95icj9hi505shz9rjrg42q2"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "6.0.0"; sha256 = "1kjiw6s4yfz9gm7mx3wkhp06ghnbs95icj9hi505shz9rjrg42q2"; })
(fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.5.0"; sha256 = "00gz2i8kx4mlq1ywj3imvf7wc6qzh0bsnynhw06z0mgyha1a21jy"; }) (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.6.0"; sha256 = "1bnwpwg7k72z06027ip4yi222863r8sv14ck9nj8h64ckiw2r256"; })
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; })
(fetchNuGet { pname = "Microsoft.OpenApi"; version = "1.2.3"; sha256 = "07b19k89whj69j87afkz86gp9b3iybw8jqwvlgcn43m7fb2y99rr"; }) (fetchNuGet { pname = "Microsoft.OpenApi"; version = "1.2.3"; sha256 = "07b19k89whj69j87afkz86gp9b3iybw8jqwvlgcn43m7fb2y99rr"; })
(fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.5.0"; sha256 = "0qkjyf3ky6xpjg5is2sdsawm99ka7fzgid2bvpglwmmawqgm8gls"; }) (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.6.0"; sha256 = "1rz22chnis11dwjrqrcvvmfw80fi2a7756a7ahwy6jlnr250zr61"; })
(fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.5.0"; sha256 = "17g0k3r5n8grba8kg4nghjyhnq9w8v0w6c2nkyyygvfh8k8x9wh3"; }) (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.6.0"; sha256 = "16vpicp4q2kbpgr3qwpsxg7srabxqszx23x6smjvvrvz7qmr5v8i"; })
(fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; })
(fetchNuGet { pname = "MSTest.TestAdapter"; version = "3.0.2"; sha256 = "1pzn95nhmprfvchwshyy87jifzjpvdny21b5yhkqafr150nxlz77"; }) (fetchNuGet { pname = "MSTest.TestAdapter"; version = "3.0.3"; sha256 = "12f5h28115vv7j17whq7f9fwnww3p7iwfbkq3m24m0si303cgqbw"; })
(fetchNuGet { pname = "MSTest.TestFramework"; version = "3.0.2"; sha256 = "1yiwi0hi8pn9dv90vz1yw13izap8dv13asxvr9axcliis0ad5iaq"; }) (fetchNuGet { pname = "MSTest.TestFramework"; version = "3.0.3"; sha256 = "0d9nmgj97qpd4w8x609amcawmcywm2q0r2w1p2hvyah0p5s9m0f3"; })
(fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; })
(fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; sha256 = "0xrwysmrn4midrjal8g2hr1bbg38iyisl0svamb11arqws4w2bw7"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; sha256 = "0xrwysmrn4midrjal8g2hr1bbg38iyisl0svamb11arqws4w2bw7"; })
(fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.2"; sha256 = "0c27bhy9x3c2n26inq32kmp6drpm71n6mqnmcr19wrlcaihglj35"; }) (fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.2"; sha256 = "0c27bhy9x3c2n26inq32kmp6drpm71n6mqnmcr19wrlcaihglj35"; })

6
pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix
View file

@ -9,11 +9,11 @@ buildNpmPackage {
repo = "ASF-ui"; repo = "ASF-ui";
# updated by the update script # updated by the update script
# this is always the commit that should be used with asf-ui from the latest asf version # this is always the commit that should be used with asf-ui from the latest asf version
rev = "114c390c92a889b86cf560def28fb8f39bc4fe54"; rev = "3078d92e8b8d79571b771f452a53d1789330c541";
sha256 = "1ajmi2l6xhv3nlnag2kmkblny925irp4gngdc3mniiimw364p826"; hash = "sha256-K3YTgsde9aqtmKuFKjXpoWe6USGpKBlC6eeazuOYTqk=";
}; };
npmDepsHash = "sha256-AY1DFuZkB8tOQd2FzHuNZ31rtLlWujP+3AqsMMB2BhU="; npmDepsHash = "sha256-L+aWsGMUmIsPJRQ4XPg8WOWOqHKcfDQTqUK+vGBHi0Y=";
installPhase = '' installPhase = ''
runHook preInstall runHook preInstall

14
pkgs/applications/misc/ArchiSteamFarm/web-ui/update.sh
View file

@ -10,20 +10,14 @@ pushd "$(dirname "$0")"
ui=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} "https://api.github.com/repos/JustArchiNET/ArchiSteamFarm/contents/ASF-ui?ref=$version" | jq -r .sha) ui=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} "https://api.github.com/repos/JustArchiNET/ArchiSteamFarm/contents/ASF-ui?ref=$version" | jq -r .sha)
curl "https://raw.githubusercontent.com/JustArchiNET/ASF-ui/$ui/package-lock.json" -o package-lock.json curl "https://raw.githubusercontent.com/JustArchiNET/ASF-ui/$ui/package-lock.json" -o package-lock.json
curl "https://raw.githubusercontent.com/JustArchiNET/ASF-ui/$ui/package.json" -o package.json
# update-source-version doesn't work for some reason # update-source-version doesn't work for some reason
sed -i "s/rev\\s*=\\s*.*/rev = \"$ui\";/" default.nix sed -i "s/rev\\s*=\\s*.*/rev = \"$ui\";/" default.nix
sed -i "s/sha256\\s*=\\s*.*/sha256 = \"$(nix-prefetch-url --unpack "https://github.com/JustArchiNET/ASF-ui/archive/$ui.tar.gz")\";/" default.nix sed -i "s/hash\\s*=\\s*.*/hash = \"$(nix-prefetch fetchurl --url "https://github.com/JustArchiNET/ASF-ui/archive/$ui.tar.gz")\";/" default.nix
node2nix \ npmDepsHash=$(prefetch-npm-deps ./package-lock.json)
--nodejs-14 \ sed -E 's#\bnpmDepsHash = ".*?"#npmDepsHash = "'"$npmDepsHash"'"#' -i default.nix
--development \
--lock package-lock.json \
--node-env ../../../../development/node-packages/node-env.nix \
--output node-packages.nix \
--composition node-composition.nix \
rm package.json package-lock.json rm package-lock.json
popd popd

4
pkgs/applications/misc/khal/default.nix
View file

@ -8,13 +8,13 @@
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "khal"; pname = "khal";
version = "0.11.1"; version = "0.11.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "pimutils"; owner = "pimutils";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-5wBKo24EKdEUoYhhv1EqMPOjdwUS31d3R24kLdbyvPA="; hash = "sha256-yI33pB/t+UISvSbLUzmsZqBxLF6r8R3j9iPNeosKcYw=";
}; };
SETUPTOOLS_SCM_PRETEND_VERSION = version; SETUPTOOLS_SCM_PRETEND_VERSION = version;

4
pkgs/applications/misc/spicetify-cli/default.nix
View file

@ -6,9 +6,9 @@ buildGoModule rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "spicetify"; owner = "spicetify";
repo = pname; repo = "spicetify-cli";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-6pOFDQqzxA1eHI66BHL9Yst1PtGyJzhmFveCErBA2pU="; hash = "sha256-6pOFDQqzxA1eHI66BHL9Yst1PtGyJzhmFveCErBA2pU=";
}; };
vendorHash = "sha256-g0SuXDzYjg0mGzeDuB2tQnVnDmTiL5vw0r9QWSgIs3Q="; vendorHash = "sha256-g0SuXDzYjg0mGzeDuB2tQnVnDmTiL5vw0r9QWSgIs3Q=";

4
pkgs/applications/misc/sticky/default.nix
View file

@ -12,14 +12,14 @@
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "sticky"; pname = "sticky";
version = "1.14"; version = "1.16";
format = "other"; format = "other";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "linuxmint"; owner = "linuxmint";
repo = pname; repo = pname;
rev = version; rev = version;
hash = "sha256-7UZbCbzQ1ZrSzxTUdbA+wsH3p27qj/c/cM4GY/kzG6E="; hash = "sha256-+opzjvSdGwwn1imNzSsfD9rfs4naSXzcMBJRPhKW2WM=";
}; };
postPatch = '' postPatch = ''

40
pkgs/applications/misc/waycorner/default.nix Normal file
View file

@ -0,0 +1,40 @@
{ lib
, makeWrapper
, rustPlatform
, pkg-config
, fetchFromGitHub
, wayland
,
}:
rustPlatform.buildRustPackage rec {
pname = "waycorner";
version = "0.2.1";
src = fetchFromGitHub {
owner = "AndreasBackx";
repo = "waycorner";
rev = version;
hash = "sha256-xvmvtn6dMqt8kUwvn5d5Nl1V84kz1eWa9BSIN/ONkSQ=";
};
cargoHash = "sha256-Dl+GhJywWhaC4QMS70klazPsFipGVRW+6jrXH2XsEAI=";
buildInputs = [
wayland
];
nativeBuildInputs = [
pkg-config
makeWrapper
];
postFixup = ''
# the program looks for libwayland-client.so at runtime
wrapProgram $out/bin/waycorner \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ wayland ]}
'';
meta = with lib; {
description = "Hot corners for Wayland";
changelog = "https://github.com/AndreasBackx/waycorner/blob/main/CHANGELOG.md";
homepage = "https://github.com/AndreasBackx/waycorner";
platforms = platforms.linux;
license = licenses.mit;
maintainers = with maintainers; [ NotAShelf ];
};
}

4
pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix
View file

@ -3,12 +3,12 @@ electron, libsecret }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "tutanota-desktop"; pname = "tutanota-desktop";
version = "3.112.6"; version = "3.113.3";
src = fetchurl { src = fetchurl {
url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/${pname}-${version}-unpacked-linux.tar.gz"; url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/${pname}-${version}-unpacked-linux.tar.gz";
name = "tutanota-desktop-${version}.tar.gz"; name = "tutanota-desktop-${version}.tar.gz";
sha256 = "sha256-Kqj6XQkwPU7pmR8JY8f7iMqpOYjvWxS5Yir/YTBPXjM="; sha256 = "sha256-d4yvz0BE0YeZjcH9X/2eGAk5CmJI4CQWblVoU5CO77k=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

18
pkgs/applications/science/misc/gephi/default.nix
View file

@ -1,20 +1,20 @@
{ lib, stdenv, fetchFromGitHub, jdk, maven, javaPackages }: { lib, stdenv, fetchFromGitHub, jdk11, maven, javaPackages }:
let let
version = "0.9.6"; version = "0.10.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "gephi"; owner = "gephi";
repo = "gephi"; repo = "gephi";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-3+tOwcE7TUeexJCugFsx9SgsKeb7ApNqbMEIi9QaKPE="; hash = "sha256-ZNSEaiD32zFfF2ISKa1CmcT9Nq6r5i2rNHooQAcVbn4=";
}; };
# perform fake build to make a fixed-output derivation out of the files downloaded from maven central (120MB) # perform fake build to make a fixed-output derivation out of the files downloaded from maven central (120MB)
deps = stdenv.mkDerivation { deps = stdenv.mkDerivation {
name = "gephi-${version}-deps"; name = "gephi-${version}-deps";
inherit src; inherit src;
buildInputs = [ jdk maven ]; buildInputs = [ jdk11 maven ];
buildPhase = '' buildPhase = ''
while mvn package -Dmaven.repo.local=$out/.m2 -Dmaven.wagon.rto=5000; [ $? = 1 ]; do while mvn package -Dmaven.repo.local=$out/.m2 -Dmaven.wagon.rto=5000; [ $? = 1 ]; do
echo "timeout, restart maven to continue downloading" echo "timeout, restart maven to continue downloading"
@ -24,7 +24,7 @@ let
installPhase = ''find $out/.m2 -type f -regex '.+\(\.lastUpdated\|resolver-status\.properties\|_remote\.repositories\)' -delete''; installPhase = ''find $out/.m2 -type f -regex '.+\(\.lastUpdated\|resolver-status\.properties\|_remote\.repositories\)' -delete'';
outputHashAlgo = "sha256"; outputHashAlgo = "sha256";
outputHashMode = "recursive"; outputHashMode = "recursive";
outputHash = "sha256-kIPsZN0alRAgiMbckQnMWKOKtCZ37D/6MgT17VYcr+s="; outputHash = "sha256-OdW4M5nGEkYkmHpRLM4cBQtk4SJII2uqM8TXb6y4eXk=";
}; };
in in
stdenv.mkDerivation { stdenv.mkDerivation {
@ -33,7 +33,7 @@ stdenv.mkDerivation {
inherit src; inherit src;
buildInputs = [ jdk maven ]; buildInputs = [ jdk11 maven ];
buildPhase = '' buildPhase = ''
# 'maven.repo.local' must be writable so copy it out of nix store # 'maven.repo.local' must be writable so copy it out of nix store
@ -49,10 +49,10 @@ stdenv.mkDerivation {
# use self-compiled JOGL to avoid patchelf'ing .so inside jars # use self-compiled JOGL to avoid patchelf'ing .so inside jars
rm $out/gephi/modules/ext/org.gephi.visualization/org-jogamp-{jogl,gluegen}/*.jar rm $out/gephi/modules/ext/org.gephi.visualization/org-jogamp-{jogl,gluegen}/*.jar
cp ${javaPackages.jogl_2_3_2}/share/java/jogl*.jar $out/gephi/modules/ext/org.gephi.visualization/org-jogamp-jogl/ cp ${javaPackages.jogl_2_4_0}/share/java/jogl*.jar $out/gephi/modules/ext/org.gephi.visualization/org-jogamp-jogl/
cp ${javaPackages.jogl_2_3_2}/share/java/glue*.jar $out/gephi/modules/ext/org.gephi.visualization/org-jogamp-gluegen/ cp ${javaPackages.jogl_2_4_0}/share/java/glue*.jar $out/gephi/modules/ext/org.gephi.visualization/org-jogamp-gluegen/
echo "jdkhome=${jdk}" >> $out/etc/gephi.conf printf "\n\njdkhome=${jdk11}\n" >> $out/etc/gephi.conf
''; '';
meta = with lib; { meta = with lib; {

4
pkgs/applications/version-management/git-repo/default.nix
View file

@ -4,13 +4,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "git-repo"; pname = "git-repo";
version = "2.32"; version = "2.34.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "android"; owner = "android";
repo = "tools_repo"; repo = "tools_repo";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-WY77F4culQ1y8UDIhI117AHBL5mEk40s8HpP3+5muZI="; hash = "sha256-jSHUtgghYI9Wgdf7RGYjVlq7iSJT612Lv5M2mq7L4EA=";
}; };
# Fix 'NameError: name 'ssl' is not defined' # Fix 'NameError: name 'ssl' is not defined'

6
pkgs/applications/version-management/gitoxide/default.nix
View file

@ -13,16 +13,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "gitoxide"; pname = "gitoxide";
version = "0.25.0"; version = "0.26.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Byron"; owner = "Byron";
repo = "gitoxide"; repo = "gitoxide";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-3U/gQz/tJ/IrDd7ZIusJWDEB4nlpTM4miYfTEeEonv4="; sha256 = "sha256-RAcKnS7vLuzXBxasHBxjmrdxyVvexou0SmiVu6ysZOQ=";
}; };
cargoHash = "sha256-VPOivxdqEWQdFYYhSZVe5ji8CS0dKQeElKPeHxfwg4A="; cargoHash = "sha256-w2WfBQoccpE71jOrjeuNF6HPTfY6lxpzg/AUEIngSJo=";
nativeBuildInputs = [ cmake pkg-config ]; nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ curl ] ++ (if stdenv.isDarwin buildInputs = [ curl ] ++ (if stdenv.isDarwin

19
pkgs/applications/virtualization/gvisor/default.nix
View file

@ -9,20 +9,31 @@
buildGoModule rec { buildGoModule rec {
pname = "gvisor"; pname = "gvisor";
version = "20221102.1"; version = "20230529.0";
# gvisor provides a synthetic go branch (https://github.com/google/gvisor/tree/go) # gvisor provides a synthetic go branch (https://github.com/google/gvisor/tree/go)
# that can be used to build gvisor without bazel. # that can be used to build gvisor without bazel.
#
# For updates, you should stick to the commits labeled "Merge release-** (automated)" # For updates, you should stick to the commits labeled "Merge release-** (automated)"
# Make sure to check that the tagged commit for a release aligns with the version in
# the message for good measure; e.g. the commit
#
# 142d38d770a07291877dc0d50b88b719dbef76dc is "Merge release-20230522.0-11-g919cfd12b (automated)"
#
# on the 'go' branch. But the mentioned commit, 919cfd12b..., is actually tagged as release-20230529.0
#
# https://github.com/google/gvisor/releases/tag/release-202329.0
#
# Presumably this is a result of the release process. Handle with care.
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "google"; owner = "google";
repo = "gvisor"; repo = "gvisor";
rev = "bf8eeee3a9eb966bc72c773da060a3c8bb73b8ff"; rev = "142d38d770a07291877dc0d50b88b719dbef76dc";
sha256 = "sha256-rADQsJ+AnBVlfQURGJl1xR6Ad5NyRWSrBSpOFMRld+o="; hash = "sha256-Ukcjlz/6iUmDAUpQpIVfZHKbwK90Mt6fukcFaw64hQI=";
}; };
vendorSha256 = "sha256-iGLWxx/Kn1QaJTNOZcc+mwoF3ecEDOkaqmA0DH4pdgU="; vendorHash = "sha256-COr47mZ4tsbzMjkv63l+fexo0RL5lrBXeewak9CuZVk=";
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];

4
pkgs/data/icons/fluent-icon-theme/default.nix
View file

@ -16,13 +16,13 @@ lib.checkListOfEnum "${pname}: available color variants" [ "standard" "green" "g
stdenvNoCC.mkDerivation rec { stdenvNoCC.mkDerivation rec {
inherit pname; inherit pname;
version = "2023-02-01"; version = "2023-06-07";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "vinceliuice"; owner = "vinceliuice";
repo = pname; repo = pname;
rev = version; rev = version;
hash = "sha256-Plm05+5r6p9MabLmmh8kWitALGFalruBbhAgBhPCjRo="; hash = "sha256-drEAjIY/lacqncSeVeNmeRX6v4PnLvGo66Na1fuFXRg=";
}; };
nativeBuildInputs = [ gtk3 jdupes ]; nativeBuildInputs = [ gtk3 jdupes ];

4
pkgs/data/icons/qogir-icon-theme/default.nix
View file

@ -18,13 +18,13 @@ lib.checkListOfEnum "${pname}: theme variants" [ "default" "manjaro" "ubuntu" "a
stdenvNoCC.mkDerivation rec { stdenvNoCC.mkDerivation rec {
inherit pname; inherit pname;
version = "2023-02-23"; version = "2023-06-05";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "vinceliuice"; owner = "vinceliuice";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-yXpHm/iXtBdEo6m8W7Itp3N9vrWRTb7S3aKi0X2RObo="; sha256 = "sha256-qiHmA/K4hdXVSFzergGhgssKR+kXp3X0cqtX1X5ayM4=";
}; };
nativeBuildInputs = [ gtk3 jdupes ]; nativeBuildInputs = [ gtk3 jdupes ];

4
pkgs/desktops/cinnamon/bulky/default.nix
View file

@ -13,13 +13,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "bulky"; pname = "bulky";
version = "2.8"; version = "2.9";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "linuxmint"; owner = "linuxmint";
repo = "bulky"; repo = "bulky";
rev = version; rev = version;
hash = "sha256-DZjX4xPyA30TTyOX+VyGSY/FWPX2316CYImDWRma9r0="; hash = "sha256-eCu7AgL4bzstu8vsqBJImRZm1qMVnnycuOShY5fB+C4=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

33
pkgs/desktops/cinnamon/cinnamon-common/default.nix
View file

@ -155,20 +155,20 @@ stdenv.mkDerivation rec {
-e s,/usr/share/locale,/run/current-system/sw/share/locale,g \ -e s,/usr/share/locale,/run/current-system/sw/share/locale,g \
{} + {} +
sed "s|/usr/share/sounds|/run/current-system/sw/share/sounds|g" -i ./files/usr/share/cinnamon/cinnamon-settings/bin/SettingsWidgets.py # All optional and may introduce circular dependency.
find ./files/usr/share/cinnamon/applets -type f -exec sed -i \
-e '/^#/!s,/usr/bin,/run/current-system/sw/bin,g' \
{} +
sed "s|'python3'|'${pythonEnv.interpreter}'|g" -i ./files/usr/share/cinnamon/cinnamon-settings/bin/CinnamonGtkSettings.py pushd ./files/usr/share/cinnamon/cinnamon-settings
substituteInPlace ./bin/capi.py --replace '"/usr/lib"' '"${cinnamon-control-center}/lib"'
substituteInPlace ./bin/CinnamonGtkSettings.py --replace "'python3'" "'${pythonEnv.interpreter}'"
substituteInPlace ./bin/SettingsWidgets.py --replace "/usr/share/sounds" "/run/current-system/sw/share/sounds"
substituteInPlace ./bin/Spices.py --replace "msgfmt" "${gettext}/bin/msgfmt"
substituteInPlace ./modules/cs_info.py --replace "lspci" "${pciutils}/bin/lspci"
popd
sed "s|/usr/bin/cinnamon-screensaver-command|/run/current-system/sw/bin/cinnamon-screensaver-command|g" \ sed "s| cinnamon-session| ${cinnamon-session}/bin/cinnamon-session|g" -i ./files/usr/bin/cinnamon-session-{cinnamon,cinnamon2d}
-i ./files/usr/share/cinnamon/applets/menu@cinnamon.org/applet.js -i ./files/usr/share/cinnamon/applets/user@cinnamon.org/applet.js
sed "s|\"/usr/lib\"|\"${cinnamon-control-center}/lib\"|g" -i ./files/usr/share/cinnamon/cinnamon-settings/bin/capi.py
sed 's|"lspci"|"${pciutils}/bin/lspci"|g' -i ./files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py
sed "s| cinnamon-session| ${cinnamon-session}/bin/cinnamon-session|g" -i ./files/usr/bin/cinnamon-session-cinnamon -i ./files/usr/bin/cinnamon-session-cinnamon2d
sed "s|msgfmt|${gettext}/bin/msgfmt|g" -i ./files/usr/share/cinnamon/cinnamon-settings/bin/Spices.py
patchShebangs src/data-to-c.pl patchShebangs src/data-to-c.pl
''; '';
@ -179,9 +179,16 @@ stdenv.mkDerivation rec {
--prefix XDG_DATA_DIRS : "${gnome.caribou}/share" --prefix XDG_DATA_DIRS : "${gnome.caribou}/share"
) )
buildPythonPath "$out ${python3.pkgs.xapp}"
# https://github.com/NixOS/nixpkgs/issues/200397
patchPythonScript $out/bin/cinnamon-spice-updater
# https://github.com/NixOS/nixpkgs/issues/129946 # https://github.com/NixOS/nixpkgs/issues/129946
buildPythonPath "${python3.pkgs.xapp}"
patchPythonScript $out/share/cinnamon/cinnamon-desktop-editor/cinnamon-desktop-editor.py patchPythonScript $out/share/cinnamon/cinnamon-desktop-editor/cinnamon-desktop-editor.py
# Called as `pkexec cinnamon-settings-users.py`.
wrapGApp $out/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py
''; '';
passthru = { passthru = {

6
pkgs/desktops/cinnamon/mint-cursor-themes/default.nix
View file

@ -5,14 +5,14 @@
stdenvNoCC.mkDerivation rec { stdenvNoCC.mkDerivation rec {
pname = "mint-cursor-themes"; pname = "mint-cursor-themes";
version = "1.0.1"; version = "1.0.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "linuxmint"; owner = "linuxmint";
repo = pname; repo = pname;
# They don't really do tags, this is just a named commit. # They don't really do tags, this is just a named commit.
rev = "e17f8a4620827235dabbe5221bd0ee8c44dad0d5"; rev = "d2c1428b499a347c291dafb13c89699fdbdd4be7";
hash = "sha256-yLUmIVh884uDVkNil7qxf6t/gykipzBvPgzwmY3zvQk="; hash = "sha256-i2Wf+OKwal9G5hkcAdmGSgX6txu1AHajqqPJdhpJoA0=";
}; };
installPhase = '' installPhase = ''

4
pkgs/desktops/cinnamon/warpinator/default.nix
View file

@ -33,13 +33,13 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "warpinator"; pname = "warpinator";
version = "1.6.2"; version = "1.6.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "linuxmint"; owner = "linuxmint";
repo = pname; repo = pname;
rev = version; rev = version;
hash = "sha256-crGW1FBfTEiKqx981EzG414we4icyBv/keGtMlr8UFc="; hash = "sha256-iCq2cwZgsq5/bJqjYuZ6dZLqz2nIpgHCrIQeMVxJNXY=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

7
pkgs/desktops/cinnamon/xapp/default.nix
View file

@ -79,12 +79,11 @@ stdenv.mkDerivation rec {
# Patch pastebin & inxi location # Patch pastebin & inxi location
sed "s|/usr/bin/pastebin|$out/bin/pastebin|" -i scripts/upload-system-info sed "s|/usr/bin/pastebin|$out/bin/pastebin|" -i scripts/upload-system-info
sed "s|'inxi'|'${inxi}/bin/inxi'|" -i scripts/upload-system-info sed "s|'inxi'|'${inxi}/bin/inxi'|" -i scripts/upload-system-info
# Patch gtk3 module target dir
substituteInPlace libxapp/meson.build \
--replace "gtk3_dep.get_pkgconfig_variable('libdir')" "'$out'"
''; '';
# Fix gtk3 module target dir. Proper upstream solution should be using define_variable.
PKG_CONFIG_GTK__3_0_LIBDIR = "${placeholder "out"}/lib";
meta = with lib; { meta = with lib; {
homepage = "https://github.com/linuxmint/xapp"; homepage = "https://github.com/linuxmint/xapp";
description = "Cross-desktop libraries and common resources"; description = "Cross-desktop libraries and common resources";

63
pkgs/development/compilers/erg/default.nix Normal file
View file

@ -0,0 +1,63 @@
{ lib
, rustPlatform
, fetchFromGitHub
, makeWrapper
, python3
, which
}:
rustPlatform.buildRustPackage rec {
pname = "erg";
version = "0.6.13";
src = fetchFromGitHub {
owner = "erg-lang";
repo = "erg";
rev = "v${version}";
hash = "sha256-XwQKtorE1HGRRCCtxQBVbl6O6aTs5Z2/W9n2Am40e8Q=";
};
cargoHash = "sha256-I4hQ78RTkCDKpq7HBNJsKqCiFL9004XvWdwtRdTQQkE=";
nativeBuildInputs = [
makeWrapper
python3
which
];
buildFeatures = [ "full" ];
env = {
BUILD_DATE = "1970/01/01 00:00:00";
GIT_HASH_SHORT = src.rev;
};
# TODO(figsoda): fix tests
doCheck = false;
# the build script is impure and also assumes we are in a git repository
postPatch = ''
rm crates/erg_common/build.rs
'';
preBuild = ''
export HOME=$(mktemp -d)
export CARGO_ERG_PATH=$HOME/.erg
'';
postInstall = ''
mkdir -p $out/share
mv "$CARGO_ERG_PATH" $out/share/erg
wrapProgram $out/bin/erg \
--set-default ERG_PATH $out/share/erg
'';
meta = with lib; {
description = "A statically typed language that can deeply improve the Python ecosystem";
homepage = "https://github.com/erg-lang/erg";
changelog = "https://github.com/erg-lang/erg/releases/tag/${src.rev}";
license = with licenses; [ asl20 mit ];
maintainers = with maintainers; [ figsoda ];
};
}

25
pkgs/development/compilers/jsonnet/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, lib, jekyll, fetchFromGitHub }: { stdenv, lib, jekyll, cmake, fetchFromGitHub, gtest }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "jsonnet"; pname = "jsonnet";
@ -12,28 +12,21 @@ stdenv.mkDerivation rec {
sha256 = "sha256-FtVJE9alEl56Uik+nCpJMV5DMVVmRCnE1xMAiWdK39Y="; sha256 = "sha256-FtVJE9alEl56Uik+nCpJMV5DMVVmRCnE1xMAiWdK39Y=";
}; };
nativeBuildInputs = [ jekyll ]; nativeBuildInputs = [ jekyll cmake ];
buildInputs = [ gtest ];
cmakeFlags = ["-DBUILD_STATIC_LIBS=ON" "-DUSE_SYSTEM_GTEST=ON" ];
enableParallelBuilding = true; enableParallelBuilding = true;
makeFlags = [
"jsonnet"
"jsonnetfmt"
"libjsonnet.so"
];
# Upstream writes documentation in html, not in markdown/rst, so no # Upstream writes documentation in html, not in markdown/rst, so no
# other output formats, sorry. # other output formats, sorry.
preBuild = '' postBuild = ''
jekyll build --source ./doc --destination ./html jekyll build --source ../doc --destination ./html
''; '';
installPhase = '' postInstall = ''
mkdir -p $out/bin $out/lib $out/include $out/share/doc/jsonnet mkdir -p $out/share/doc/jsonnet
cp jsonnet $out/bin/
cp jsonnetfmt $out/bin/
cp libjsonnet*.so $out/lib/
cp -a include/*.h $out/include/
cp -r ./html $out/share/doc/jsonnet cp -r ./html $out/share/doc/jsonnet
''; '';

6
pkgs/development/compilers/unison/default.nix
View file

@ -6,18 +6,18 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "unison-code-manager"; pname = "unison-code-manager";
milestone_id = "M4h"; milestone_id = "M4i";
version = "1.0.${milestone_id}-alpha"; version = "1.0.${milestone_id}-alpha";
src = if (stdenv.isDarwin) then src = if (stdenv.isDarwin) then
fetchurl { fetchurl {
url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/ucm-macos.tar.gz"; url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/ucm-macos.tar.gz";
hash = "sha256-7yphap7qZBkbTKiwhyCTLgbBO/aA0eUWtva+XjpaZDI="; hash = "sha256-1Qp1SB5rCsVimZzRo1NOX8HBoMEGlIycJPm3zGTUuOw=";
} }
else else
fetchurl { fetchurl {
url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/ucm-linux.tar.gz"; url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/ucm-linux.tar.gz";
hash = "sha256-vrZpYFoQw1hxgZ7lAoejIqnjIOFFMahAI9SjFN/Cnms="; hash = "sha256-Qx8vO/Vaz0VdCGXwIwRQIuMlp44hxCroQ7m7Y+m7aXk=";
}; };
# The tarball is just the prebuilt binary, in the archive root. # The tarball is just the prebuilt binary, in the archive root.

77
pkgs/development/java-modules/jogl/default.nix
View file

@ -1,6 +1,81 @@
{ lib, stdenv, fetchgit, ant, jdk8, git, xorg, udev, libGL, libGLU }: { coreutils, lib, stdenv, fetchgit, ant, jdk8, jdk11, git, xorg, udev, libGL, libGLU, mesa, xmlstarlet }:
{ {
jogl_2_4_0 =
let
version = "2.4.0";
gluegen-src = fetchgit {
url = "git://jogamp.org/srv/scm/gluegen.git";
rev = "v${version}";
hash = "sha256-qQzq7v2vMFeia6gXaNHS3AbOp9HhDRgISp7P++CKErA=";
fetchSubmodules = true;
};
jogl-src = fetchgit {
url = "git://jogamp.org/srv/scm/jogl.git";
rev = "v${version}";
hash = "sha256-PHDq7uFEQfJ2P0eXPUi0DGFR1ob/n5a68otgzpFnfzQ=";
fetchSubmodules = true;
};
in
stdenv.mkDerivation {
pname = "jogl";
inherit version;
srcs = [ gluegen-src jogl-src ];
sourceRoot = ".";
unpackCmd = "cp -r $curSrc \${curSrc##*-}";
nativeBuildInputs = [ ant jdk11 git xmlstarlet ];
buildInputs = [ udev xorg.libX11 xorg.libXrandr xorg.libXcursor xorg.libXi xorg.libXt xorg.libXxf86vm xorg.libXrender mesa ];
# Workaround build failure on -fno-common toolchains:
# ld: ../obj/Bindingtest1p1Impl_JNI.o:(.bss+0x8): multiple definition of
# `unsigned_size_t_1'; ../obj/TK_Surface_JNI.o:(.bss+0x8): first defined here
NIX_CFLAGS_COMPILE = "-fcommon"; # copied from 2.3.2, is this still needed?
buildPhase = ''
( cd gluegen/make
substituteInPlace ../src/java/com/jogamp/common/util/IOUtil.java --replace '#!/bin/true' '#!${coreutils}/bin/true'
# set timestamp of files in jar to a fixed point in time
xmlstarlet ed --inplace \
--append //jar --type attr -n modificationtime --value 1980-01-01T00:00Z \
build.xml gluegen-cpptasks-base.xml
ant -Dtarget.sourcelevel=8 -Dtarget.targetlevel=8 -Dtarget.rt.jar='null.jar' )
( cd jogl/make
# force way to do disfunctional "ant -Dsetup.addNativeBroadcom=false" and disable dependency on raspberrypi drivers
# if arm/aarch64 support will be added, this block might be commented out on those platforms
# on x86 compiling with default "setup.addNativeBroadcom=true" leads to unsatisfied import "vc_dispmanx_resource_delete" in libnewt.so
xmlstarlet ed --inplace --delete '//*[@if="setup.addNativeBroadcom"]' build-newt.xml
# set timestamp of files in jar to a fixed point in time
xmlstarlet ed --inplace \
--append //jar --type attr -n modificationtime --value 1980-01-01T00:00Z \
build.xml build-nativewindow.xml build-jogl.xml
ant -Dtarget.sourcelevel=8 -Dtarget.targetlevel=8 -Dtarget.rt.jar='null.jar' )
'';
installPhase = ''
mkdir -p $out/share/java
cp -v $NIX_BUILD_TOP/gluegen/build/gluegen-rt{,-natives-linux-amd64}.jar $out/share/java/
cp -v $NIX_BUILD_TOP/jogl/build/jar/jogl-all{,-natives-linux-amd64}.jar $out/share/java/
cp -v $NIX_BUILD_TOP/jogl/build/nativewindow/nativewindow{,-awt,-natives-linux-amd64,-os-drm,-os-x11}.jar $out/share/java/
'';
meta = with lib; {
description = "Java libraries for 3D Graphics, Multimedia and Processing";
homepage = "https://jogamp.org/";
license = licenses.bsd3;
platforms = [ "x86_64-linux" ];
};
};
jogl_2_3_2 = jogl_2_3_2 =
let let
version = "2.3.2"; version = "2.3.2";

4
pkgs/development/libraries/cpp-utilities/default.nix
View file

@ -8,13 +8,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "cpp-utilities"; pname = "cpp-utilities";
version = "5.22.0"; version = "5.23.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Martchus"; owner = "Martchus";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-c36FzKDAaalKVIrqVSCoslrKVopW77cGdGwfiMbaXe4="; sha256 = "sha256-gZF+dsj+KYrFklnJHT04XSGLdlEdslFmxeStz6jVl24=";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];

4
pkgs/development/libraries/eccodes/default.nix
View file

@ -16,11 +16,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "eccodes"; pname = "eccodes";
version = "2.30.0"; version = "2.30.2";
src = fetchurl { src = fetchurl {
url = "https://confluence.ecmwf.int/download/attachments/45757960/eccodes-${version}-Source.tar.gz"; url = "https://confluence.ecmwf.int/download/attachments/45757960/eccodes-${version}-Source.tar.gz";
sha256 = "sha256-s9yTidBYQaLpyVeqUgmIpUwmBRY95kt+c8CEqu0fw8Q="; sha256 = "sha256-ObleQiGxFtyBhlbQTIKIQFXUiuuqKZDCWeqM3/2kJYI=";
}; };
postPatch = '' postPatch = ''

347
pkgs/development/libraries/libdeltachat/Cargo.lock generated
View file

@ -88,6 +88,12 @@ dependencies = [
"alloc-no-stdlib", "alloc-no-stdlib",
] ]
[[package]]
name = "android-tzdata"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
[[package]] [[package]]
name = "android_system_properties" name = "android_system_properties"
version = "0.1.5" version = "0.1.5"
@ -112,6 +118,12 @@ dependencies = [
"winapi", "winapi",
] ]
[[package]]
name = "anstyle"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d"
[[package]] [[package]]
name = "anyhow" name = "anyhow"
version = "1.0.71" version = "1.0.71"
@ -209,7 +221,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d11e163a705d0c809dfc886eee95df5117c758539c940c0fe9aa3aa4da5388ce" checksum = "d11e163a705d0c809dfc886eee95df5117c758539c940c0fe9aa3aa4da5388ce"
dependencies = [ dependencies = [
"async-channel", "async-channel",
"base64 0.21.0", "base64 0.21.2",
"byte-pool", "byte-pool",
"chrono", "chrono",
"futures", "futures",
@ -270,7 +282,7 @@ checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.15", "syn 2.0.18",
] ]
[[package]] [[package]]
@ -287,17 +299,6 @@ dependencies = [
"tokio", "tokio",
] ]
[[package]]
name = "atty"
version = "0.2.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
dependencies = [
"hermit-abi 0.1.19",
"libc",
"winapi",
]
[[package]] [[package]]
name = "autocfg" name = "autocfg"
version = "1.1.0" version = "1.1.0"
@ -312,7 +313,7 @@ checksum = "f8175979259124331c1d7bf6586ee7e0da434155e4b2d48ec2c8386281d8df39"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"axum-core", "axum-core",
"base64 0.21.0", "base64 0.21.2",
"bitflags 1.3.2", "bitflags 1.3.2",
"bytes", "bytes",
"futures-util", "futures-util",
@ -403,9 +404,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
[[package]] [[package]]
name = "base64" name = "base64"
version = "0.21.0" version = "0.21.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d"
[[package]] [[package]]
name = "base64ct" name = "base64ct"
@ -655,13 +656,13 @@ dependencies = [
[[package]] [[package]]
name = "chrono" name = "chrono"
version = "0.4.24" version = "0.4.26"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b" checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5"
dependencies = [ dependencies = [
"android-tzdata",
"iana-time-zone", "iana-time-zone",
"js-sys", "js-sys",
"num-integer",
"num-traits", "num-traits",
"time 0.1.45", "time 0.1.45",
"wasm-bindgen", "wasm-bindgen",
@ -707,24 +708,29 @@ dependencies = [
[[package]] [[package]]
name = "clap" name = "clap"
version = "3.2.23" version = "4.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" checksum = "b4ed2379f8603fa2b7509891660e802b88c70a79a6427a70abb5968054de2c28"
dependencies = [ dependencies = [
"clap_builder",
]
[[package]]
name = "clap_builder"
version = "4.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "72394f3339a76daf211e57d4bcb374410f3965dcc606dd0e03738c7888766980"
dependencies = [
"anstyle",
"bitflags 1.3.2", "bitflags 1.3.2",
"clap_lex", "clap_lex",
"indexmap",
"textwrap",
] ]
[[package]] [[package]]
name = "clap_lex" name = "clap_lex"
version = "0.2.4" version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b"
dependencies = [
"os_str_bytes",
]
[[package]] [[package]]
name = "clipboard-win" name = "clipboard-win"
@ -854,20 +860,20 @@ dependencies = [
[[package]] [[package]]
name = "criterion" name = "criterion"
version = "0.4.0" version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e7c76e09c1aae2bc52b3d2f29e13c6572553b30c4aa1b8a49fd70de6412654cb" checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f"
dependencies = [ dependencies = [
"anes", "anes",
"atty",
"cast", "cast",
"ciborium", "ciborium",
"clap", "clap",
"criterion-plot", "criterion-plot",
"futures", "futures",
"is-terminal",
"itertools", "itertools",
"lazy_static",
"num-traits", "num-traits",
"once_cell",
"oorandom", "oorandom",
"plotters", "plotters",
"rayon", "rayon",
@ -977,6 +983,16 @@ dependencies = [
"typenum", "typenum",
] ]
[[package]]
name = "ctor"
version = "0.1.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096"
dependencies = [
"quote",
"syn 1.0.109",
]
[[package]] [[package]]
name = "curve25519-dalek" name = "curve25519-dalek"
version = "3.2.0" version = "3.2.0"
@ -1144,7 +1160,7 @@ dependencies = [
[[package]] [[package]]
name = "deltachat" name = "deltachat"
version = "1.115.0" version = "1.116.0"
dependencies = [ dependencies = [
"ansi_term", "ansi_term",
"anyhow", "anyhow",
@ -1154,7 +1170,7 @@ dependencies = [
"async-smtp", "async-smtp",
"async_zip", "async_zip",
"backtrace", "backtrace",
"base64 0.21.0", "base64 0.21.2",
"brotli", "brotli",
"chrono", "chrono",
"criterion", "criterion",
@ -1183,6 +1199,7 @@ dependencies = [
"parking_lot", "parking_lot",
"percent-encoding", "percent-encoding",
"pgp", "pgp",
"pretty_assertions",
"pretty_env_logger", "pretty_env_logger",
"proptest", "proptest",
"qrcodegen", "qrcodegen",
@ -1219,18 +1236,19 @@ dependencies = [
[[package]] [[package]]
name = "deltachat-jsonrpc" name = "deltachat-jsonrpc"
version = "1.115.0" version = "1.116.0"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"async-channel", "async-channel",
"axum", "axum",
"base64 0.21.0", "base64 0.21.2",
"deltachat", "deltachat",
"env_logger 0.10.0", "env_logger",
"futures", "futures",
"log", "log",
"num-traits", "num-traits",
"sanitize-filename", "sanitize-filename",
"schemars",
"serde", "serde",
"serde_json", "serde_json",
"tempfile", "tempfile",
@ -1242,7 +1260,7 @@ dependencies = [
[[package]] [[package]]
name = "deltachat-repl" name = "deltachat-repl"
version = "1.115.0" version = "1.116.0"
dependencies = [ dependencies = [
"ansi_term", "ansi_term",
"anyhow", "anyhow",
@ -1257,12 +1275,12 @@ dependencies = [
[[package]] [[package]]
name = "deltachat-rpc-server" name = "deltachat-rpc-server"
version = "1.115.0" version = "1.116.0"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"deltachat", "deltachat",
"deltachat-jsonrpc", "deltachat-jsonrpc",
"env_logger 0.10.0", "env_logger",
"futures-lite", "futures-lite",
"log", "log",
"serde", "serde",
@ -1277,12 +1295,12 @@ name = "deltachat_derive"
version = "2.0.0" version = "2.0.0"
dependencies = [ dependencies = [
"quote", "quote",
"syn 2.0.15", "syn 2.0.18",
] ]
[[package]] [[package]]
name = "deltachat_ffi" name = "deltachat_ffi"
version = "1.115.0" version = "1.116.0"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"deltachat", "deltachat",
@ -1295,6 +1313,7 @@ dependencies = [
"serde_json", "serde_json",
"thiserror", "thiserror",
"tokio", "tokio",
"yerpc",
] ]
[[package]] [[package]]
@ -1399,6 +1418,12 @@ dependencies = [
"cipher", "cipher",
] ]
[[package]]
name = "diff"
version = "0.1.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8"
[[package]] [[package]]
name = "digest" name = "digest"
version = "0.9.0" version = "0.9.0"
@ -1496,6 +1521,12 @@ dependencies = [
"syn 1.0.109", "syn 1.0.109",
] ]
[[package]]
name = "dyn-clone"
version = "1.0.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "68b0cf012f1230e43cd00ebb729c6bb58707ecfa8ad08b52ef3a4ccd2697fc30"
[[package]] [[package]]
name = "ecdsa" name = "ecdsa"
version = "0.14.8" version = "0.14.8"
@ -1766,26 +1797,13 @@ dependencies = [
"syn 1.0.109", "syn 1.0.109",
] ]
[[package]]
name = "env_logger"
version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36"
dependencies = [
"atty",
"humantime 1.3.0",
"log",
"regex",
"termcolor",
]
[[package]] [[package]]
name = "env_logger" name = "env_logger"
version = "0.10.0" version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0"
dependencies = [ dependencies = [
"humantime 2.1.0", "humantime",
"is-terminal", "is-terminal",
"log", "log",
"regex", "regex",
@ -2058,7 +2076,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.15", "syn 2.0.18",
] ]
[[package]] [[package]]
@ -2166,9 +2184,9 @@ dependencies = [
[[package]] [[package]]
name = "h2" name = "h2"
version = "0.3.18" version = "0.3.19"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "17f8a914c2987b688368b5138aa05321db91f4090cf26118185672ad588bce21" checksum = "d357c7ae988e7d2182f7d7871d0b963962420b0678b0997ce7de72001aeab782"
dependencies = [ dependencies = [
"bytes", "bytes",
"fnv", "fnv",
@ -2213,15 +2231,6 @@ version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
[[package]]
name = "hermit-abi"
version = "0.1.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
dependencies = [
"libc",
]
[[package]] [[package]]
name = "hermit-abi" name = "hermit-abi"
version = "0.2.6" version = "0.2.6"
@ -2329,15 +2338,6 @@ dependencies = [
"libm 0.2.6", "libm 0.2.6",
] ]
[[package]]
name = "humantime"
version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f"
dependencies = [
"quick-error 1.2.3",
]
[[package]] [[package]]
name = "humantime" name = "humantime"
version = "2.1.0" version = "2.1.0"
@ -2530,7 +2530,7 @@ checksum = "e4fb9858c8cd3dd924a5da5bc511363845a9bcfdfac066bb2ef8454eb6111546"
dependencies = [ dependencies = [
"abao", "abao",
"anyhow", "anyhow",
"base64 0.21.0", "base64 0.21.2",
"blake3", "blake3",
"bytes", "bytes",
"default-net", "default-net",
@ -2661,9 +2661,9 @@ dependencies = [
[[package]] [[package]]
name = "libc" name = "libc"
version = "0.2.142" version = "0.2.145"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6a987beff54b60ffa6d51982e1aa1146bc42f19bd26be28b0586f252fccf5317" checksum = "fc86cde3ff845662b8f4ef6cb50ea0e20c524eb3d29ae048287e06a1b3fa6a81"
[[package]] [[package]]
name = "libm" name = "libm"
@ -2722,12 +2722,9 @@ dependencies = [
[[package]] [[package]]
name = "log" name = "log"
version = "0.4.17" version = "0.4.18"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" checksum = "518ef76f2f87365916b142844c16d8fefd85039bc5699050210a7778ee1cd1de"
dependencies = [
"cfg-if",
]
[[package]] [[package]]
name = "lru-cache" name = "lru-cache"
@ -3083,9 +3080,9 @@ dependencies = [
[[package]] [[package]]
name = "once_cell" name = "once_cell"
version = "1.17.1" version = "1.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
[[package]] [[package]]
name = "oorandom" name = "oorandom"
@ -3171,12 +3168,6 @@ dependencies = [
"winapi", "winapi",
] ]
[[package]]
name = "os_str_bytes"
version = "6.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee"
[[package]] [[package]]
name = "ouroboros" name = "ouroboros"
version = "0.15.6" version = "0.15.6"
@ -3200,6 +3191,15 @@ dependencies = [
"syn 1.0.109", "syn 1.0.109",
] ]
[[package]]
name = "output_vt100"
version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "628223faebab4e3e40667ee0b2336d34a5b960ff60ea743ddfdbcf7770bcfb66"
dependencies = [
"winapi",
]
[[package]] [[package]]
name = "overload" name = "overload"
version = "0.1.1" version = "0.1.1"
@ -3326,9 +3326,9 @@ dependencies = [
[[package]] [[package]]
name = "percent-encoding" name = "percent-encoding"
version = "2.2.0" version = "2.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"
[[package]] [[package]]
name = "pgp" name = "pgp"
@ -3337,7 +3337,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "37a79d6411154d1a9908e7a2c4bac60a5742f6125823c2c30780c7039aef02f0" checksum = "37a79d6411154d1a9908e7a2c4bac60a5742f6125823c2c30780c7039aef02f0"
dependencies = [ dependencies = [
"aes", "aes",
"base64 0.21.0", "base64 0.21.2",
"bitfield", "bitfield",
"block-padding", "block-padding",
"blowfish", "blowfish",
@ -3545,12 +3545,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
[[package]] [[package]]
name = "pretty_env_logger" name = "pretty_assertions"
version = "0.4.0" version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "926d36b9553851b8b0005f1275891b392ee4d2d833852c417ed025477350fb9d" checksum = "a25e9bcb20aa780fd0bb16b72403a9064d6b3f22f026946029acb941a50af755"
dependencies = [ dependencies = [
"env_logger 0.7.1", "ctor",
"diff",
"output_vt100",
"yansi",
]
[[package]]
name = "pretty_env_logger"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "865724d4dbe39d9f3dd3b52b88d859d66bcb2d6a0acfd5ea68a65fb66d4bdc1c"
dependencies = [
"env_logger",
"log", "log",
] ]
@ -3589,24 +3601,23 @@ dependencies = [
[[package]] [[package]]
name = "proc-macro2" name = "proc-macro2"
version = "1.0.55" version = "1.0.59"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1d0dd4be24fcdcfeaa12a432d588dc59bbad6cad3510c67e74a2b6b2fc950564" checksum = "6aeca18b86b413c660b781aa319e4e2648a3e6f9eadc9b47e9038e6fe9f3451b"
dependencies = [ dependencies = [
"unicode-ident", "unicode-ident",
] ]
[[package]] [[package]]
name = "proptest" name = "proptest"
version = "1.1.0" version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "29f1b898011ce9595050a68e60f90bad083ff2987a695a42357134c8381fba70" checksum = "4e35c06b98bf36aba164cc17cb25f7e232f5c4aeea73baa14b8a9f0d92dbfa65"
dependencies = [ dependencies = [
"bitflags 1.3.2", "bitflags 1.3.2",
"byteorder", "byteorder",
"lazy_static", "lazy_static",
"num-traits", "num-traits",
"quick-error 2.0.1",
"rand 0.8.5", "rand 0.8.5",
"rand_chacha 0.3.1", "rand_chacha 0.3.1",
"rand_xorshift", "rand_xorshift",
@ -3644,12 +3655,6 @@ version = "1.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
[[package]]
name = "quick-error"
version = "2.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
[[package]] [[package]]
name = "quick-xml" name = "quick-xml"
version = "0.28.2" version = "0.28.2"
@ -3709,9 +3714,9 @@ dependencies = [
[[package]] [[package]]
name = "quote" name = "quote"
version = "1.0.26" version = "1.0.28"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
] ]
@ -3881,13 +3886,13 @@ dependencies = [
[[package]] [[package]]
name = "regex" name = "regex"
version = "1.8.1" version = "1.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "af83e617f331cc6ae2da5443c602dfa5af81e517212d9d611a5b3ba1777b5370" checksum = "81ca098a9821bd52d6b24fd8b10bd081f47d39c22778cafaa75a2857a62c6390"
dependencies = [ dependencies = [
"aho-corasick", "aho-corasick",
"memchr", "memchr",
"regex-syntax 0.7.1", "regex-syntax 0.7.2",
] ]
[[package]] [[package]]
@ -3907,17 +3912,17 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
[[package]] [[package]]
name = "regex-syntax" name = "regex-syntax"
version = "0.7.1" version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c" checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78"
[[package]] [[package]]
name = "reqwest" name = "reqwest"
version = "0.11.17" version = "0.11.18"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "13293b639a097af28fc8a90f22add145a9c954e49d77da06263d58cf44d5fb91" checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55"
dependencies = [ dependencies = [
"base64 0.21.0", "base64 0.21.2",
"bytes", "bytes",
"encoding_rs", "encoding_rs",
"futures-core", "futures-core",
@ -3955,7 +3960,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00" checksum = "52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00"
dependencies = [ dependencies = [
"hostname", "hostname",
"quick-error 1.2.3", "quick-error",
] ]
[[package]] [[package]]
@ -4137,7 +4142,7 @@ version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b"
dependencies = [ dependencies = [
"base64 0.21.0", "base64 0.21.2",
] ]
[[package]] [[package]]
@ -4209,6 +4214,30 @@ dependencies = [
"windows-sys 0.42.0", "windows-sys 0.42.0",
] ]
[[package]]
name = "schemars"
version = "0.8.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "02c613288622e5f0c3fdc5dbd4db1c5fbe752746b1d1a56a0630b78fd00de44f"
dependencies = [
"dyn-clone",
"schemars_derive",
"serde",
"serde_json",
]
[[package]]
name = "schemars_derive"
version = "0.8.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "109da1e6b197438deb6db99952990c7f959572794b80ff93707d55a232545e7c"
dependencies = [
"proc-macro2",
"quote",
"serde_derive_internals",
"syn 1.0.109",
]
[[package]] [[package]]
name = "scopeguard" name = "scopeguard"
version = "1.1.0" version = "1.1.0"
@ -4293,9 +4322,9 @@ dependencies = [
[[package]] [[package]]
name = "serde" name = "serde"
version = "1.0.160" version = "1.0.163"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c" checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2"
dependencies = [ dependencies = [
"serde_derive", "serde_derive",
] ]
@ -4320,13 +4349,24 @@ dependencies = [
[[package]] [[package]]
name = "serde_derive" name = "serde_derive"
version = "1.0.160" version = "1.0.163"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df" checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.15", "syn 2.0.18",
]
[[package]]
name = "serde_derive_internals"
version = "0.26.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c"
dependencies = [
"proc-macro2",
"quote",
"syn 1.0.109",
] ]
[[package]] [[package]]
@ -4351,9 +4391,9 @@ dependencies = [
[[package]] [[package]]
name = "serde_spanned" name = "serde_spanned"
version = "0.6.1" version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4" checksum = "93107647184f6027e3b7dcb2e11034cf95ffa1e3a682c67951963ac69c1c007d"
dependencies = [ dependencies = [
"serde", "serde",
] ]
@ -4633,9 +4673,9 @@ dependencies = [
[[package]] [[package]]
name = "syn" name = "syn"
version = "2.0.15" version = "2.0.18"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -4765,7 +4805,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.15", "syn 2.0.18",
] ]
[[package]] [[package]]
@ -4843,9 +4883,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
[[package]] [[package]]
name = "tokio" name = "tokio"
version = "1.28.0" version = "1.28.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c3c786bf8134e5a3a166db9b29ab8f48134739014a3eca7bc6bfa95d673b136f" checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2"
dependencies = [ dependencies = [
"autocfg", "autocfg",
"bytes", "bytes",
@ -4878,7 +4918,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.15", "syn 2.0.18",
] ]
[[package]] [[package]]
@ -4960,9 +5000,9 @@ dependencies = [
[[package]] [[package]]
name = "toml" name = "toml"
version = "0.7.3" version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21" checksum = "d6135d499e69981f9ff0ef2167955a5333c35e36f6937d382974566b3d5b94ec"
dependencies = [ dependencies = [
"serde", "serde",
"serde_spanned", "serde_spanned",
@ -4972,18 +5012,18 @@ dependencies = [
[[package]] [[package]]
name = "toml_datetime" name = "toml_datetime"
version = "0.6.1" version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" checksum = "5a76a9312f5ba4c2dec6b9161fdf25d87ad8a09256ccea5a556fef03c706a10f"
dependencies = [ dependencies = [
"serde", "serde",
] ]
[[package]] [[package]]
name = "toml_edit" name = "toml_edit"
version = "0.19.8" version = "0.19.10"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" checksum = "2380d56e8670370eee6566b0bfd4265f65b3f432e8c6d85623f728d4fa31f739"
dependencies = [ dependencies = [
"indexmap", "indexmap",
"serde", "serde",
@ -5288,9 +5328,9 @@ checksum = "936e4b492acfd135421d8dca4b1aa80a7bfc26e702ef3af710e0752684df5372"
[[package]] [[package]]
name = "uuid" name = "uuid"
version = "1.3.2" version = "1.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4dad5567ad0cf5b760e5665964bec1b47dfd077ba8a2544b513f3556d3d239a2" checksum = "345444e32442451b267fc254ae85a209c64be56d2890e601a0c37ff0c3c5ecd2"
dependencies = [ dependencies = [
"getrandom 0.2.8", "getrandom 0.2.8",
"serde", "serde",
@ -5689,9 +5729,9 @@ checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
[[package]] [[package]]
name = "winnow" name = "winnow"
version = "0.4.1" version = "0.4.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28" checksum = "61de7bac303dc551fe038e2b3cef0f571087a47571ea6e79a87692ac99b99699"
dependencies = [ dependencies = [
"memchr", "memchr",
] ]
@ -5743,6 +5783,12 @@ dependencies = [
"libc", "libc",
] ]
[[package]]
name = "yansi"
version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec"
[[package]] [[package]]
name = "yasna" name = "yasna"
version = "0.5.1" version = "0.5.1"
@ -5754,9 +5800,9 @@ dependencies = [
[[package]] [[package]]
name = "yerpc" name = "yerpc"
version = "0.4.3" version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b6a0257f42e6bdc187f37074723b6094da3502cee21ae517b3c54d2c37d506e7" checksum = "30fc983d32883ecb563227a2dcdcbe8567decd9c533b5ecca7e3099e2f7d4c96"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"async-channel", "async-channel",
@ -5766,6 +5812,7 @@ dependencies = [
"futures", "futures",
"futures-util", "futures-util",
"log", "log",
"schemars",
"serde", "serde",
"serde_json", "serde_json",
"tokio", "tokio",
@ -5776,9 +5823,9 @@ dependencies = [
[[package]] [[package]]
name = "yerpc_derive" name = "yerpc_derive"
version = "0.4.3" version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6bd53ff9053698697b92c2535bf7ecb983fd5d546d690b7c725e5070d6d9a620" checksum = "6d6b8ce490e8719fe84d7d80ad4d58572b2ea9d7a83d156f6afd6ab3ad5cfb94"
dependencies = [ dependencies = [
"convert_case 0.5.0", "convert_case 0.5.0",
"darling 0.14.3", "darling 0.14.3",

4
pkgs/development/libraries/libdeltachat/default.nix
View file

@ -19,13 +19,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libdeltachat"; pname = "libdeltachat";
version = "1.115.0"; version = "1.116.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "deltachat"; owner = "deltachat";
repo = "deltachat-core-rust"; repo = "deltachat-core-rust";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-GAU/v2/MwvgqtZnvp2wwrKpPXhzr5g7QxVngR+pt35c="; hash = "sha256-fSTte2rqy0w4zk9Vh4y3/UWplR0hvwdBqSoSYjoUhPg=";
}; };
patches = [ patches = [

4
pkgs/development/libraries/liblouis/default.nix
View file

@ -13,7 +13,7 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "liblouis"; pname = "liblouis";
version = "3.25.0"; version = "3.26.0";
outputs = [ "out" "dev" "info" "doc" ] outputs = [ "out" "dev" "info" "doc" ]
# configure: WARNING: cannot generate manual pages while cross compiling # configure: WARNING: cannot generate manual pages while cross compiling
@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "liblouis"; owner = "liblouis";
repo = "liblouis"; repo = "liblouis";
rev = "v${finalAttrs.version}"; rev = "v${finalAttrs.version}";
hash = "sha256-On5PbBgvDAeD41oGb5EKBtKvi/VXnLsVrTMX7tcwnq4="; hash = "sha256-Kko9qBWdNiZ61Wbb7lUYoSNU1hhRUexPcU3pADv0UHo=";
}; };
strictDeps = true; strictDeps = true;

28
pkgs/development/libraries/rapidyaml/default.nix Normal file
View file

@ -0,0 +1,28 @@
{ lib
, stdenv
, cmake
, fetchFromGitHub
, git
}:
stdenv.mkDerivation rec {
pname = "rapidyaml";
version = "0.5.0";
src = fetchFromGitHub {
owner = "biojppm";
repo = pname;
fetchSubmodules = true;
rev = "v${version}";
sha256 = "sha256-1/P6Szgng94UU8cPFAtOKMS+EmiwfW/IJl2UTolDU5s=";
};
nativeBuildInputs = [ cmake git ];
meta = with lib; {
description = "A library to parse and emit YAML, and do it fast.";
homepage = "https://github.com/biojppm/rapidyaml";
license = licenses.mit;
maintainers = with maintainers; [ martfont ];
};
}

4
pkgs/development/python-modules/accuweather/default.nix
View file

@ -12,7 +12,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "accuweather"; pname = "accuweather";
version = "0.5.2"; version = "1.0.0";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.9"; disabled = pythonOlder "3.9";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "bieniu"; owner = "bieniu";
repo = pname; repo = pname;
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-rXA5A80PWn08VPeimJeMNWMGvzaE/gWrRuJseHiDkRg="; hash = "sha256-CWPhdu0lttYhAS6hzyKPL3vtNRVqbDexxY6nvMya3jA=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/development/python-modules/aioairzone/default.nix
View file

@ -8,7 +8,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "aioairzone"; pname = "aioairzone";
version = "0.5.5"; version = "0.6.3";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "Noltari"; owner = "Noltari";
repo = pname; repo = pname;
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-6PBNwCfh5ryR3Jub3GDykY6lRQt9wdkV8yWkvivuQpM="; hash = "sha256-grUfhUc8U7d7GgUa8TfvSPYOYr4IW1mZM0tl6I5gUdg=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

62
pkgs/development/python-modules/cacheyou/default.nix Normal file
View file

@ -0,0 +1,62 @@
{ lib
, buildPythonPackage
, cherrypy
, fetchPypi
, filelock
, msgpack
, pdm-backend
, pytestCheckHook
, pythonOlder
, redis
, requests
}:
buildPythonPackage rec {
pname = "cacheyou";
version = "23.3";
format = "pyproject";
disabled = pythonOlder "3.7";
__darwinAllowLocalNetworking = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-fkCPFfSXj+oiR3NLMIYh919/4Wm0YWeVGccuioXWHV0=";
};
nativeBuildInputs = [
pdm-backend
];
propagatedBuildInputs = [
msgpack
requests
];
passthru.optional-dependencies = {
filecache = [
filelock
];
redis = [
redis
];
};
nativeCheckInputs = [
cherrypy
pytestCheckHook
] ++ passthru.optional-dependencies.filecache;
pythonImportsCheck = [
"cacheyou"
];
meta = {
description = "The httplib2 caching algorithms packaged up for use with requests";
homepage = "https://github.com/frostming/cacheyou";
changelog = "https://github.com/frostming/cacheyou/releases/tag/${version}";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ natsukium ];
};
}

12
pkgs/development/python-modules/devolo-plc-api/default.nix
View file

@ -1,7 +1,6 @@
{ lib { lib
, buildPythonPackage , buildPythonPackage
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, httpx , httpx
, protobuf , protobuf
, pytest-asyncio , pytest-asyncio
@ -10,12 +9,13 @@
, pytestCheckHook , pytestCheckHook
, pythonOlder , pythonOlder
, setuptools-scm , setuptools-scm
, syrupy
, zeroconf , zeroconf
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "devolo-plc-api"; pname = "devolo-plc-api";
version = "1.3.0"; version = "1.3.1";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -24,9 +24,14 @@ buildPythonPackage rec {
owner = "2Fake"; owner = "2Fake";
repo = "devolo_plc_api"; repo = "devolo_plc_api";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-ika0mypHo7a8GCa2eNhOLIhMZ2ASwJOxV4mmAzvJm0E="; hash = "sha256-wJyBCQ9rk+UwjWhMIeqsIbMR8cXA9Xu+lmubJoOauEg=";
}; };
postPatch = ''
substituteInPlace pyproject.toml \
--replace "protobuf>=4.22.0" "protobuf"
'';
SETUPTOOLS_SCM_PRETEND_VERSION = version; SETUPTOOLS_SCM_PRETEND_VERSION = version;
nativeBuildInputs = [ nativeBuildInputs = [
@ -44,6 +49,7 @@ buildPythonPackage rec {
pytest-httpx pytest-httpx
pytest-mock pytest-mock
pytestCheckHook pytestCheckHook
syrupy
]; ];
pythonImportsCheck = [ pythonImportsCheck = [

4
pkgs/development/python-modules/django-oauth-toolkit/default.nix
View file

@ -19,14 +19,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "django-oauth-toolkit"; pname = "django-oauth-toolkit";
version = "2.2.0"; version = "2.3.0";
format = "setuptools"; format = "setuptools";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jazzband"; owner = "jazzband";
repo = pname; repo = pname;
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-mynchdvrfBGKMeFFb2oDaANhtSCxq85Nibx7GfSY2nQ="; hash = "sha256-oGg5MD9p4PSUVkt5pGLwjAF4SHHf4Aqr+/3FsuFaybY=";
}; };
postPatch = '' postPatch = ''

4
pkgs/development/python-modules/fastdownload/default.nix
View file

@ -8,13 +8,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "fastdownload"; pname = "fastdownload";
version = "0.0.6"; version = "0.0.7";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-1ayb0zx8rFKDgqlq/tVVLqDkh47T5jofHt53r8bWr30="; sha256 = "sha256-IFB+246JQGofvXd15uKj2BpN1jPdUGsOnPDhYT6DHWo=";
}; };
propagatedBuildInputs = [ fastprogress fastcore ]; propagatedBuildInputs = [ fastprogress fastcore ];

39
pkgs/development/python-modules/favicon/default.nix
View file

@ -1,26 +1,47 @@
{ lib, buildPythonPackage, fetchPypi, requests, beautifulsoup4, pytest, requests-mock, { lib
pytest-runner }: , beautifulsoup4
, buildPythonPackage
, fetchPypi
, pytestCheckHook
, pythonOlder
, requests
, requests-mock
}:
buildPythonPackage rec { buildPythonPackage rec {
pname = "favicon"; pname = "favicon";
version = "0.7.0"; version = "0.7.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "6d6b5a78de2a0d0084589f687f384b2ecd6a6527093fec564403b1a30605d7a8"; hash = "sha256-bWtaeN4qDQCEWJ9ofzhLLs1qZScJP+xWRAOxowYF16g=";
}; };
buildInputs = [ pytest-runner ]; postPatch = ''
nativeCheckInputs = [ pytest requests-mock ]; sed -i "/pytest-runner/d" setup.py
propagatedBuildInputs = [ requests beautifulsoup4 ];
checkPhase = ''
pytest
''; '';
propagatedBuildInputs = [
beautifulsoup4
requests
];
nativeCheckInputs = [
pytestCheckHook
requests-mock
];
pythonImportsCheck = [
"favicon"
];
meta = with lib; { meta = with lib; {
description = "Find a website's favicon"; description = "Find a website's favicon";
homepage = "https://github.com/scottwernervt/favicon"; homepage = "https://github.com/scottwernervt/favicon";
changelog = "https://github.com/scottwernervt/favicon/blob/${version}/CHANGELOG.rst";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ elohmeier ]; maintainers = with maintainers; [ elohmeier ];
}; };

4
pkgs/development/python-modules/jupyter-lsp/default.nix
View file

@ -7,11 +7,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "jupyter-lsp"; pname = "jupyter-lsp";
version = "2.0.0"; version = "2.2.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-89n1mdSOCTpLq/vawZTDAzLmJIzkoD1z+nEviMd55Rk="; hash = "sha256-jrvLUzrbQeXWNeuP6ClWsKr78P1EO2xL+pBu3uuGNaE=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/development/python-modules/jupyterlab-lsp/default.nix
View file

@ -7,11 +7,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "jupyterlab-lsp"; pname = "jupyterlab-lsp";
version = "4.0.1"; version = "4.2.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-1VPRfs+F24h2xJeoJglZQpuCcPDk6Ptf8cWrAW3G5to="; hash = "sha256-OqsByMrAQKjTqev6QIUiOwVLf71iGdPHtWD2qXZsovM=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

37
pkgs/development/python-modules/knx-frontend/default.nix Normal file
View file

@ -0,0 +1,37 @@
{ lib
, buildPythonPackage
, fetchPypi
, setuptools
}:
buildPythonPackage rec {
pname = "knx-frontend";
version = "2023.5.31.141540";
format = "pyproject";
# TODO: source build, uses yarn.lock
src = fetchPypi {
pname = "knx_frontend";
inherit version;
hash = "sha256-j0p3PUYnKsyuDaN+nMrIHhxLYhNXVkZQkgsp//ZTsXE=";
};
nativeBuildInputs = [
setuptools
];
pythonImportsCheck = [
"knx_frontend"
];
# no tests
doCheck = false;
meta = with lib; {
changelog = "https://github.com/XKNX/knx-frontend/releases/tag/${version}";
description = "Home Assistant Panel for managing the KNX integration";
homepage = "https://github.com/XKNX/knx-frontend";
license = licenses.mit;
maintainers = with maintainers; [ hexa ];
};
}

14
pkgs/development/python-modules/maxcube-api/default.nix
View file

@ -1,9 +1,8 @@
{ lib { lib
, buildPythonPackage , buildPythonPackage
, pythonAtLeast
, pythonOlder , pythonOlder
, fetchFromGitHub , fetchFromGitHub
, unittestCheckHook , pytestCheckHook
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -23,7 +22,14 @@ buildPythonPackage rec {
substituteInPlace setup.py --replace "license=license" "license='MIT'" substituteInPlace setup.py --replace "license=license" "license='MIT'"
''; '';
nativeCheckInputs = [ unittestCheckHook ]; nativeCheckInputs = [
pytestCheckHook
];
disabledTests = [
"testSendRadioMsgClosesConnectionOnErrorAndRetriesIfReusingConnection"
"testSendRadioMsgReusesConnection"
];
pythonImportsCheck = [ pythonImportsCheck = [
"maxcube" "maxcube"
@ -31,8 +37,6 @@ buildPythonPackage rec {
]; ];
meta = with lib; { meta = with lib; {
# Tests indicate lack of 3.11 compatibility
broken = pythonAtLeast "3.11";
description = "eQ-3/ELV MAX! Cube Python API"; description = "eQ-3/ELV MAX! Cube Python API";
homepage = "https://github.com/hackercowboy/python-maxcube-api"; homepage = "https://github.com/hackercowboy/python-maxcube-api";
license = licenses.mit; license = licenses.mit;

46
pkgs/development/python-modules/py-partiql-parser/default.nix Normal file
View file

@ -0,0 +1,46 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, nix-update-script
, pytestCheckHook
, setuptools
, sure
}:
buildPythonPackage rec {
pname = "py-partiql-parser";
version = "0.3.3";
format = "pyproject";
src = fetchFromGitHub {
owner = "getmoto";
repo = "py-partiql-parser";
rev = "refs/tags/${version}";
hash = "sha256-7FYIRlr75L0y1d9jgbPpq/G7VC4YMD7IUQVNhfHdCh8=";
};
nativeBuildInputs = [
setuptools
];
nativeCheckInputs = [
pytestCheckHook
sure
];
pythonImportsCheck = [
"py_partiql_parser"
];
passthru = {
updateScript = nix-update-script { };
};
meta = with lib; {
description = "A tokenizer/parser/executor for the PartiQL-language, in Python";
homepage = "https://github.com/getmoto/py-partiql-parser";
changelog = "https://github.com/getmoto/py-partiql-parser/blob/${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ centromere ];
};
}

4
pkgs/development/python-modules/pydeconz/default.nix
View file

@ -12,7 +12,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pydeconz"; pname = "pydeconz";
version = "111"; version = "113";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.9"; disabled = pythonOlder "3.9";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "Kane610"; owner = "Kane610";
repo = "deconz"; repo = "deconz";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-QBun9VT42W9EMvNuLZoe6VnXKXAKEXstDKCU7LXEvNQ="; hash = "sha256-Vf3nYUopaGY5JK//rqqsz47VRHwql1cQcslYbkH3owQ=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

19
pkgs/development/python-modules/pyhaversion/default.nix
View file

@ -23,6 +23,12 @@ buildPythonPackage rec {
hash = "sha256-HMJqZn0yzN2dP5WTRCbem1Xw8nyH2Hy7oVP4kEKHHAo="; hash = "sha256-HMJqZn0yzN2dP5WTRCbem1Xw8nyH2Hy7oVP4kEKHHAo=";
}; };
postPatch = ''
# Upstream doesn't set a version for the tagged releases
substituteInPlace setup.py \
--replace "main" ${version}
'';
propagatedBuildInputs = [ propagatedBuildInputs = [
aiohttp aiohttp
awesomeversion awesomeversion
@ -34,17 +40,16 @@ buildPythonPackage rec {
pytestCheckHook pytestCheckHook
]; ];
postPatch = ''
# Upstream doesn't set a version for the tagged releases
substituteInPlace setup.py \
--replace "main" ${version}
'';
pythonImportsCheck = [ pythonImportsCheck = [
"pyhaversion" "pyhaversion"
]; ];
disabledTests = [
# Error fetching version information from HaVersionSource.SUPERVISOR Server disconnected
"test_stable_version"
"test_etag"
];
meta = with lib; { meta = with lib; {
description = "Python module to the newest version number of Home Assistant"; description = "Python module to the newest version number of Home Assistant";
homepage = "https://github.com/ludeeus/pyhaversion"; homepage = "https://github.com/ludeeus/pyhaversion";

4
pkgs/development/python-modules/python-otbr-api/default.nix
View file

@ -12,7 +12,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "python-otbr-api"; pname = "python-otbr-api";
version = "1.2.0"; version = "2.1.0";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.9"; disabled = pythonOlder "3.9";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "home-assistant-libs"; owner = "home-assistant-libs";
repo = pname; repo = pname;
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-IPglUB+Xla+IjWzHhfG+SDHY/jucg46ppnhHBHKTEiE="; hash = "sha256-LM09hQ5ELWLCymk8oxHcqTngs4mXg59uY2OrSpizQXo=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

27
pkgs/development/python-modules/python-tado/default.nix
View file

@ -1,20 +1,33 @@
{ buildPythonPackage, fetchFromGitHub, lib, pytestCheckHook, pythonOlder, requests }: { buildPythonPackage
, fetchFromGitHub
, lib
, pytestCheckHook
, pythonOlder
, requests
}:
buildPythonPackage rec { buildPythonPackage {
pname = "python-tado"; pname = "python-tado";
version = "0.12.0"; version = "0.15.0";
format = "setuptools";
disabled = pythonOlder "3.5"; disabled = pythonOlder "3.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "wmalgadey"; owner = "wmalgadey";
repo = "PyTado"; repo = "PyTado";
rev = version; # https://github.com/wmalgadey/PyTado/issues/62
hash = "sha256-n+H6H2ORLizv9cn1P5Cd8wHDWMNonPrs+x+XMQbEzZQ="; rev = "674dbc450170a380e76460c22d6ba943dfedb8e9";
hash = "sha256-gduqQVw/a64aDzTHFmgZu7OVB53jZb7L5vofzL3Ho6s=";
}; };
propagatedBuildInputs = [ requests ]; propagatedBuildInputs = [
nativeCheckInputs = [ pytestCheckHook ]; requests
];
nativeCheckInputs = [
pytestCheckHook
];
meta = with lib; { meta = with lib; {
description = description =

6
pkgs/development/python-modules/pyzerproc/default.nix
View file

@ -5,6 +5,7 @@
, fetchFromGitHub , fetchFromGitHub
, pytest-asyncio , pytest-asyncio
, pytest-mock , pytest-mock
, pythonAtLeast
, pytestCheckHook , pytestCheckHook
, pythonOlder , pythonOlder
}: }:
@ -38,6 +39,11 @@ buildPythonPackage rec {
pytestCheckHook pytestCheckHook
]; ];
disabledTestPaths = lib.optionals (pythonAtLeast "3.11") [
# unittest.mock.InvalidSpecError: Cannot spec a Mock object.
"tests/test_light.py"
];
pythonImportsCheck = [ pythonImportsCheck = [
"pyzerproc" "pyzerproc"
]; ];

4
pkgs/development/python-modules/rokuecp/default.nix
View file

@ -17,7 +17,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "rokuecp"; pname = "rokuecp";
version = "0.17.1"; version = "0.18.0";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.9"; disabled = pythonOlder "3.9";
@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "ctalkington"; owner = "ctalkington";
repo = "python-rokuecp"; repo = "python-rokuecp";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-3GHG4FBGMiF5kNk2gl05xiX9+5tcrUyi4SUCXTa6Qco="; hash = "sha256-YvJ1+o7/S/QNROedYGsP8m99Dr+WpAkfe5YPEN+2ZhU=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

4
pkgs/development/python-modules/textual/default.nix
View file

@ -22,7 +22,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "textual"; pname = "textual";
version = "0.26.0"; version = "0.27.0";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -31,7 +31,7 @@ buildPythonPackage rec {
owner = "Textualize"; owner = "Textualize";
repo = pname; repo = pname;
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-l4zSSROeI55hFnf0C64bbAB+1cATUkS59Uybf7ZmSfs="; hash = "sha256-ag+sJFprYW3IpH+BiMR5eSRUFMBeVuOnF6GTTuXGBHw=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

4
pkgs/development/python-modules/trimesh/default.nix
View file

@ -8,12 +8,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "trimesh"; pname = "trimesh";
version = "3.21.7"; version = "3.22.0";
format = "pyproject"; format = "pyproject";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-wtGt3PUCUiSIiQRA3NxO1nPE35XQDipWfrwSKdDBhtE="; hash = "sha256-KuE8EVl4VbIFRlddd+Cqvj+aLWU/9ZMgmgyem9inY3Q=";
}; };
nativeBuildInputs = [ setuptools ]; nativeBuildInputs = [ setuptools ];

4
pkgs/development/python-modules/xiaomi-ble/default.nix
View file

@ -14,7 +14,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "xiaomi-ble"; pname = "xiaomi-ble";
version = "0.17.1"; version = "0.17.2";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.9"; disabled = pythonOlder "3.9";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "Bluetooth-Devices"; owner = "Bluetooth-Devices";
repo = pname; repo = pname;
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-CioXmv5VJBiJx97k69Sp5kaeD59p+OSL14RVse/gYUA="; hash = "sha256-2zS34feelJNVarfe8GEZxBNL45IK+Owl6TlBDOTVvSs=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

2
pkgs/development/python-modules/zigpy-deconz/default.nix
View file

@ -1,5 +1,4 @@
{ lib { lib
, asynctest
, buildPythonPackage , buildPythonPackage
, fetchFromGitHub , fetchFromGitHub
, pyserial , pyserial
@ -31,7 +30,6 @@ buildPythonPackage rec {
]; ];
nativeCheckInputs = [ nativeCheckInputs = [
asynctest
pytest-asyncio pytest-asyncio
pytestCheckHook pytestCheckHook
]; ];

3
pkgs/development/python-modules/zigpy-xbee/default.nix
View file

@ -1,8 +1,6 @@
{ lib { lib
, asynctest
, buildPythonPackage , buildPythonPackage
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, pyserial , pyserial
, pyserial-asyncio , pyserial-asyncio
, pytest-asyncio , pytest-asyncio
@ -33,7 +31,6 @@ buildPythonPackage rec {
]; ];
nativeCheckInputs = [ nativeCheckInputs = [
asynctest
pytest-asyncio pytest-asyncio
pytestCheckHook pytestCheckHook
]; ];

15
pkgs/development/python-modules/zigpy-znp/default.nix
View file

@ -6,8 +6,8 @@
, jsonschema , jsonschema
, pytest-asyncio , pytest-asyncio
, pytest-mock , pytest-mock
, pytest-rerunfailures
, pytest-timeout , pytest-timeout
, pytest-xdist
, pytestCheckHook , pytestCheckHook
, pythonOlder , pythonOlder
, voluptuous , voluptuous
@ -44,20 +44,13 @@ buildPythonPackage rec {
nativeCheckInputs = [ nativeCheckInputs = [
pytest-asyncio pytest-asyncio
pytest-mock pytest-mock
pytest-rerunfailures
pytest-timeout pytest-timeout
pytest-xdist
pytestCheckHook pytestCheckHook
]; ];
disabledTests = [ pytestFlagsArray = [
# https://github.com/zigpy/zigpy-znp/issues/209 "--reruns=3"
"test_join_device"
"test_permit_join"
"test_request_recovery_route_rediscovery_af"
"test_request_recovery_route_rediscovery_zdo"
"test_zigpy_request"
"test_zigpy_request_failure"
"test_mgmt_nwk_update_req"
]; ];
pythonImportsCheck = [ pythonImportsCheck = [

4
pkgs/development/python-modules/zwave-js-server-python/default.nix
View file

@ -10,7 +10,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "zwave-js-server-python"; pname = "zwave-js-server-python";
version = "0.48.1"; version = "0.49.0";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.9"; disabled = pythonOlder "3.9";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "home-assistant-libs"; owner = "home-assistant-libs";
repo = pname; repo = pname;
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-fkOzt5dFDbteMMuNAxOfdlsT83dB1528gQooTqv4WB8="; hash = "sha256-6CN2Smwm693RUuRUdqrNKa7j2I3pjmR+QoPfpjti+h8=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

6
pkgs/development/tools/argc/default.nix
View file

@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "argc"; pname = "argc";
version = "1.3.0"; version = "1.4.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "sigoden"; owner = "sigoden";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-mcJAtcGVqOQNafGu59QNcABvNNkImQ2qydZylf3a2Qs="; hash = "sha256-TMBXcLicrqdykGZJjtEyobHvqK6CR6CaJoiBntj1i4o=";
}; };
cargoHash = "sha256-Q7jL+9EwHD0HcRpS6SQ2M625z2h/eA7cUF60zDpekZY="; cargoHash = "sha256-K18oD6TT0pmF0ctEO4yJlA0koeRtiMFjz/8FLb7gwo0=";
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];

6
pkgs/development/tools/ent/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "ent-go"; pname = "ent-go";
version = "0.11.0"; version = "0.12.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ent"; owner = "ent";
repo = "ent"; repo = "ent";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-EPUaBOvEAOjA24EYD0pyuNRdyX9qPxERXrBzHXC6cLI="; sha256 = "sha256-ryOpaRQi30NPDNe9rUmW+fEqWSKWEsvHl/Bd1+i88y4=";
}; };
vendorSha256 = "sha256-Q5vnfhUcbTmk3+t0D0z4dwU6pXKT7/hTfVHOUPXEzrg="; vendorSha256 = "sha256-67+4r4ByVS0LgfL7eUOdEoQ+CMRzqNjPgkq3dNfNwBY=";
subPackages = [ "cmd/ent" ]; subPackages = [ "cmd/ent" ];

4
pkgs/development/ocaml-modules/headache/default.nix → pkgs/development/tools/headache/default.nix
View file

@ -1,4 +1,6 @@
{ lib, buildDunePackage, fetchFromGitHub, camomile }: { lib, fetchFromGitHub, ocamlPackages }:
with ocamlPackages;
buildDunePackage rec { buildDunePackage rec {
pname = "headache"; pname = "headache";

6
pkgs/development/tools/jpexs/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "jpexs"; pname = "jpexs";
version = "15.0.0"; version = "18.4.1";
src = fetchzip { src = fetchzip {
url = "${meta.homepage}/releases/download/version${version}/ffdec_${version}.zip"; url = "https://github.com/jindrapetrik/jpexs-decompiler/releases/download/version${version}/ffdec_${version}.zip";
sha256 = "1w8sh0dzln6mxcbibyw6r9f9c8g0cbwxq4qbm5kawq00yydvwfza"; sha256 = "sha256-aaEL3xJZkFw78zo3IyauWJM9kOo0rJTUSKmWsv9xQZ8=";
stripRoot = false; stripRoot = false;
}; };

12
pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json
View file

@ -5761,18 +5761,6 @@
"fortiosapi": [ "fortiosapi": [
"setuptools" "setuptools"
], ],
"foundationdb51": [
"setuptools"
],
"foundationdb52": [
"setuptools"
],
"foundationdb60": [
"setuptools"
],
"foundationdb61": [
"setuptools"
],
"foundationdb71": [ "foundationdb71": [
"setuptools" "setuptools"
], ],

10
pkgs/games/xconq/default.nix
View file

@ -19,7 +19,13 @@ stdenv.mkDerivation rec {
"--with-tkconfig=${tk}/lib" "--with-tkconfig=${tk}/lib"
]; ];
CXXFLAGS = " --std=c++11 "; env.CXXFLAGS = toString [
"-std=c++11"
"-DUSE_INTERP_RESULT"
"-Wno-writable-strings"
];
enableParallelBuilding = true;
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];
@ -49,7 +55,7 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "A programmable turn-based strategy game"; description = "A programmable turn-based strategy game";
maintainers = with maintainers; [ raskin ]; maintainers = with maintainers; [ raskin ];
platforms = platforms.linux; platforms = platforms.unix;
license = licenses.gpl2; license = licenses.gpl2;
}; };
} }

104
pkgs/os-specific/darwin/cctools/llvm.nix Normal file
View file

@ -0,0 +1,104 @@
# Create a cctools-compatible bintools that uses equivalent tools from LLVM in place of the ones
# from cctools when possible.
{ lib, stdenv, makeWrapper, cctools-port, llvmPackages, enableManpages ? true }:
let
cctoolsVersion = lib.getVersion cctools-port;
llvmVersion = llvmPackages.release_version;
# `bitcode_strip` is not available until LLVM 12.
useLLVMBitcodeStrip = lib.versionAtLeast llvmVersion "12";
# A compatible implementation of `otool` was not added until LLVM 13.
useLLVMOtool = lib.versionAtLeast llvmVersion "13";
# Older versions of `strip` cause problems for the version of `codesign_allocate` available in
# the version of cctools in nixpkgs. The version of `codesign_allocate` in cctools-1005.2 does
# not appear to have issues, but the source is not available yet (as of June 2023).
useLLVMStrip = lib.versionAtLeast llvmVersion "15" || lib.versionAtLeast cctoolsVersion "1005.2";
llvm_bins = [
"dwarfdump"
"nm"
"objdump"
"size"
"strings"
]
++ lib.optional useLLVMBitcodeStrip "bitcode-strip"
++ lib.optional useLLVMOtool "otool"
++ lib.optional useLLVMStrip "strip";
# Only include the tools that LLVM doesn’t provide and that are present normally on Darwin.
# The only exceptions are the following tools, which should be reevaluated when LLVM is bumped.
# - install_name_tool (llvm-objcopy): unrecognized linker commands when building open source CF;
# - libtool (llvm-libtool-darwin): not fully compatible when used with xcbuild; and
# - lipo (llvm-lipo): crashes when running the LLVM test suite.
cctools_bins = [
"cmpdylib"
"codesign_allocate"
"ctf_insert"
"install_name_tool"
"ld"
"libtool"
"lipo"
"nmedit"
"pagestuff"
"ranlib"
"segedit"
"vtool"
]
++ lib.optional (!useLLVMBitcodeStrip) "bitcode_strip"
++ lib.optional (!useLLVMOtool) "otool"
++ lib.optional (!useLLVMStrip) "strip";
inherit (stdenv.cc) targetPrefix;
linkManPages = pkg: source: target: lib.optionalString enableManpages ''
sourcePath=${pkg}/share/man/man1/${source}.1.gz
targetPath=$man/share/man/man1/${target}.1.gz
if [ -f "$sourcePath" ]; then
mkdir -p "$(dirname "$targetPath")"
ln -s "$sourcePath" "$targetPath"
fi
'';
in
stdenv.mkDerivation {
pname = "cctools-llvm";
version = "${llvmVersion}-${cctoolsVersion}";
nativeBuildInputs = [ makeWrapper ];
# The `man` output has to be included unconditionally because darwin.binutils expects it.
outputs = [ "out" "dev" "man" ];
buildCommand = ''
mkdir -p "$out/bin" "$man"
ln -s ${lib.getDev cctools-port} "$dev"
# Use the clang-integrated assembler instead of using `as` from cctools.
makeWrapper "${lib.getBin llvmPackages.clang-unwrapped}/bin/clang" "$out/bin/${targetPrefix}as" \
--add-flags "-x assembler -integrated-as -c"
ln -s "${lib.getBin llvmPackages.bintools-unwrapped}/bin/llvm-ar" "$out/bin/${targetPrefix}ar"
${linkManPages llvmPackages.llvm-manpages "llvm-ar" "ar"}
for tool in ${toString llvm_bins}; do
cctoolsTool=''${tool/-/_}
ln -s "${lib.getBin llvmPackages.llvm}/bin/llvm-$tool" "$out/bin/${targetPrefix}$cctoolsTool"
${linkManPages llvmPackages.llvm-manpages "llvm-$tool" "$cctoolsTool"}
done
for tool in ${toString cctools_bins}; do
ln -s "${lib.getBin cctools-port}/bin/${targetPrefix}$tool" "$out/bin/${targetPrefix}$tool"
${linkManPages (lib.getMan cctools-port) "$tool" "$tool"}
done
${linkManPages (lib.getMan cctools-port) "ld64" "ld64"}
${lib.optionalString (!useLLVMOtool) # The actual man page for otool in cctools is llvm-otool
linkManPages (lib.getMan cctools-port) "llvm-otool" "llvm-otool"}
'';
passthru = { inherit targetPrefix; };
}

4
pkgs/os-specific/linux/tuxedo-keyboard/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "tuxedo-keyboard-${kernel.version}"; pname = "tuxedo-keyboard-${kernel.version}";
version = "3.1.4"; version = "3.2.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tuxedocomputers"; owner = "tuxedocomputers";
repo = "tuxedo-keyboard"; repo = "tuxedo-keyboard";
rev = "v${version}"; rev = "v${version}";
sha256 = "h6+br+JPEItym83MaVt+xo6o/zMtTv8+wsBoTeYa2AM="; hash = "sha256-pSGshUyim06Sqkp5QFzhUjeIz/N3aORvVt6DEyzQLaU=";
}; };
buildInputs = [ buildInputs = [

4
pkgs/servers/foundationdb/cmake.nix
View file

@ -21,7 +21,7 @@ let
makeFdb = makeFdb =
{ version { version
, sha256 , hash
, rev ? "refs/tags/${version}" , rev ? "refs/tags/${version}"
, officialRelease ? true , officialRelease ? true
, patches ? [] , patches ? []
@ -34,7 +34,7 @@ let
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "apple"; owner = "apple";
repo = "foundationdb"; repo = "foundationdb";
inherit rev sha256; inherit rev hash;
}; };
buildInputs = [ ssl boost msgpack toml11 ]; buildInputs = [ ssl boost msgpack toml11 ];

4
pkgs/servers/foundationdb/default.nix
View file

@ -9,8 +9,8 @@ let
cmakeBuild = import ./cmake.nix args; cmakeBuild = import ./cmake.nix args;
in { in {
foundationdb71 = cmakeBuild { foundationdb71 = cmakeBuild {
version = "7.1.30"; version = "7.1.32";
sha256 = "sha256-dAnAE1m2NZLHgP4QJvURBPcxArXvWWdhqEYwh3tU+tU"; hash = "sha256-CNJ4w1ECadj2KtcfbBPBQpXQeq9BAiw54hUgRTWPFzY=";
boost = boost178; boost = boost178;
ssl = openssl; ssl = openssl;

71
pkgs/servers/home-assistant/component-packages.nix
View file

@ -2,7 +2,7 @@
# Do not edit! # Do not edit!
{ {
version = "2023.5.4"; version = "2023.6.0";
components = { components = {
"3_day_blinds" = ps: with ps; [ "3_day_blinds" = ps: with ps; [
]; ];
@ -93,6 +93,9 @@
"airzone" = ps: with ps; [ "airzone" = ps: with ps; [
aioairzone aioairzone
]; ];
"airzone_cloud" = ps: with ps; [
aioairzone-cloud
];
"aladdin_connect" = ps: with ps; [ "aladdin_connect" = ps: with ps; [
aioaladdinconnect aioaladdinconnect
]; ];
@ -686,6 +689,10 @@
"datadog" = ps: with ps; [ "datadog" = ps: with ps; [
datadog datadog
]; ];
"date" = ps: with ps; [
];
"datetime" = ps: with ps; [
];
"ddwrt" = ps: with ps; [ "ddwrt" = ps: with ps; [
]; ];
"debugpy" = ps: with ps; [ "debugpy" = ps: with ps; [
@ -902,8 +909,15 @@
"dweet" = ps: with ps; [ "dweet" = ps: with ps; [
]; # missing inputs: dweepy ]; # missing inputs: dweepy
"dynalite" = ps: with ps; [ "dynalite" = ps: with ps; [
aiohttp-cors
dynalite-devices dynalite-devices
]; fnv-hash-fast
home-assistant-frontend
janus
pillow
psutil-home-assistant
sqlalchemy
]; # missing inputs: dynalite_panel
"eafm" = ps: with ps; [ "eafm" = ps: with ps; [
aioeafm aioeafm
]; ];
@ -947,6 +961,8 @@
"eight_sleep" = ps: with ps; [ "eight_sleep" = ps: with ps; [
pyeight pyeight
]; ];
"electrasmart" = ps: with ps; [
]; # missing inputs: pyelectra
"elgato" = ps: with ps; [ "elgato" = ps: with ps; [
elgato elgato
]; ];
@ -1395,8 +1411,6 @@
"glances" = ps: with ps; [ "glances" = ps: with ps; [
glances-api glances-api
]; ];
"goalfeed" = ps: with ps; [
]; # missing inputs: pysher
"goalzero" = ps: with ps; [ "goalzero" = ps: with ps; [
goalzero goalzero
]; ];
@ -1430,6 +1444,11 @@
]; ];
"google_domains" = ps: with ps; [ "google_domains" = ps: with ps; [
]; ];
"google_generative_ai_conversation" = ps: with ps; [
aiohttp-cors
hassil
home-assistant-intents
]; # missing inputs: google-generativeai
"google_mail" = ps: with ps; [ "google_mail" = ps: with ps; [
aiohttp-cors aiohttp-cors
fnv-hash-fast fnv-hash-fast
@ -1898,8 +1917,7 @@
zeroconf zeroconf
]; ];
"iotawatt" = ps: with ps; [ "iotawatt" = ps: with ps; [
iotawattpy ]; # missing inputs: ha-iotawattpy
];
"iperf3" = ps: with ps; [ "iperf3" = ps: with ps; [
]; # missing inputs: iperf3 ]; # missing inputs: iperf3
"ipma" = ps: with ps; [ "ipma" = ps: with ps; [
@ -1945,6 +1963,8 @@
"justnimbus" = ps: with ps; [ "justnimbus" = ps: with ps; [
justnimbus justnimbus
]; ];
"jvc_projector" = ps: with ps; [
]; # missing inputs: pyjvcprojector
"kaiterra" = ps: with ps; [ "kaiterra" = ps: with ps; [
]; # missing inputs: kaiterra-async-client ]; # missing inputs: kaiterra-async-client
"kaleidescape" = ps: with ps; [ "kaleidescape" = ps: with ps; [
@ -2034,8 +2054,15 @@
]; ];
"knx" = ps: with ps; [ "knx" = ps: with ps; [
aiohttp-cors aiohttp-cors
fnv-hash-fast
home-assistant-frontend
janus janus
knx-frontend
pillow
psutil-home-assistant
sqlalchemy
xknx xknx
xknxproject
]; ];
"kodi" = ps: with ps; [ "kodi" = ps: with ps; [
aiohttp-cors aiohttp-cors
@ -2577,8 +2604,6 @@
psutil-home-assistant psutil-home-assistant
sqlalchemy sqlalchemy
]; ];
"mycroft" = ps: with ps; [
]; # missing inputs: mycroftapi
"myq" = ps: with ps; [ "myq" = ps: with ps; [
pymyq pymyq
]; ];
@ -2838,7 +2863,7 @@
opensensemap-api opensensemap-api
]; ];
"opensky" = ps: with ps; [ "opensky" = ps: with ps; [
]; ]; # missing inputs: python-opensky
"opentherm_gw" = ps: with ps; [ "opentherm_gw" = ps: with ps; [
pyotgw pyotgw
]; ];
@ -2991,6 +3016,8 @@
]; ];
"pioneer" = ps: with ps; [ "pioneer" = ps: with ps; [
]; ];
"piper" = ps: with ps; [
];
"pjlink" = ps: with ps; [ "pjlink" = ps: with ps; [
]; # missing inputs: pypjlink2 ]; # missing inputs: pypjlink2
"plaato" = ps: with ps; [ "plaato" = ps: with ps; [
@ -3672,8 +3699,6 @@
"smarttub" = ps: with ps; [ "smarttub" = ps: with ps; [
python-smarttub python-smarttub
]; ];
"smarty" = ps: with ps; [
]; # missing inputs: pysmarty
"smhi" = ps: with ps; [ "smhi" = ps: with ps; [
smhi-pkg smhi-pkg
]; ];
@ -4124,6 +4149,8 @@
webrtcvad webrtcvad
zeroconf zeroconf
]; ];
"time" = ps: with ps; [
];
"time_date" = ps: with ps; [ "time_date" = ps: with ps; [
]; ];
"timer" = ps: with ps; [ "timer" = ps: with ps; [
@ -4417,9 +4444,6 @@
]; ];
"watson_iot" = ps: with ps; [ "watson_iot" = ps: with ps; [
]; # missing inputs: ibmiotf ]; # missing inputs: ibmiotf
"watson_tts" = ps: with ps; [
ibm-watson
];
"watttime" = ps: with ps; [ "watttime" = ps: with ps; [
aiowatttime aiowatttime
]; ];
@ -4446,6 +4470,8 @@
"whirlpool" = ps: with ps; [ "whirlpool" = ps: with ps; [
whirlpool-sixth-sense whirlpool-sixth-sense
]; ];
"whisper" = ps: with ps; [
];
"whois" = ps: with ps; [ "whois" = ps: with ps; [
whois whois
]; ];
@ -4557,6 +4583,8 @@
]; ];
"xs1" = ps: with ps; [ "xs1" = ps: with ps; [
]; # missing inputs: xs1-api-client ]; # missing inputs: xs1-api-client
"yale_home" = ps: with ps; [
];
"yale_smart_alarm" = ps: with ps; [ "yale_smart_alarm" = ps: with ps; [
yalesmartalarmclient yalesmartalarmclient
]; ];
@ -4629,6 +4657,13 @@
"youless" = ps: with ps; [ "youless" = ps: with ps; [
youless-api youless-api
]; ];
"youtube" = ps: with ps; [
aiohttp-cors
fnv-hash-fast
google-api-python-client
psutil-home-assistant
sqlalchemy
];
"zabbix" = ps: with ps; [ "zabbix" = ps: with ps; [
py-zabbix py-zabbix
]; ];
@ -4723,6 +4758,7 @@
"airvisual" "airvisual"
"airvisual_pro" "airvisual_pro"
"airzone" "airzone"
"airzone_cloud"
"aladdin_connect" "aladdin_connect"
"alarm_control_panel" "alarm_control_panel"
"alarmdecoder" "alarmdecoder"
@ -4809,6 +4845,8 @@
"crownstone" "crownstone"
"daikin" "daikin"
"datadog" "datadog"
"date"
"datetime"
"debugpy" "debugpy"
"deconz" "deconz"
"default_config" "default_config"
@ -4838,7 +4876,7 @@
"dte_energy_bridge" "dte_energy_bridge"
"duckdns" "duckdns"
"dunehd" "dunehd"
"dynalite" "dwd_weather_warnings"
"eafm" "eafm"
"easyenergy" "easyenergy"
"ecobee" "ecobee"
@ -5001,7 +5039,6 @@
"intent" "intent"
"intent_script" "intent_script"
"ios" "ios"
"iotawatt"
"ipma" "ipma"
"ipp" "ipp"
"iqvia" "iqvia"
@ -5337,6 +5374,7 @@
"tibber" "tibber"
"tile" "tile"
"tilt_ble" "tilt_ble"
"time"
"time_date" "time_date"
"timer" "timer"
"tod" "tod"
@ -5433,6 +5471,7 @@
"yeelight" "yeelight"
"yolink" "yolink"
"youless" "youless"
"youtube"
"zamg" "zamg"
"zeroconf" "zeroconf"
"zerproc" "zerproc"

35
pkgs/servers/home-assistant/default.nix
View file

@ -3,7 +3,7 @@
, callPackage , callPackage
, fetchFromGitHub , fetchFromGitHub
, fetchPypi , fetchPypi
, python3 , python311
, substituteAll , substituteAll
, ffmpeg-headless , ffmpeg-headless
, inetutils , inetutils
@ -183,16 +183,6 @@ let
}; };
}); });
python-roborock = super.python-roborock.overridePythonAttrs (oldAttrs: rec {
version = "0.8.3";
src = fetchFromGitHub {
owner = "humbertogontijo";
repo = "python-roborock";
rev = "refs/tags/v${version}";
hash = "sha256-O7MjxCQ4JwFFC2ibdU8hCPhFPQhV5/LsmDO6vRdyYL0=";
};
});
python-slugify = super.python-slugify.overridePythonAttrs (oldAttrs: rec { python-slugify = super.python-slugify.overridePythonAttrs (oldAttrs: rec {
pname = "python-slugify"; pname = "python-slugify";
version = "4.0.1"; version = "4.0.1";
@ -261,17 +251,6 @@ let
}; };
}); });
# Pinned due to API changes in 0.4.0
vilfo-api-client = super.vilfo-api-client.overridePythonAttrs (oldAttrs: rec {
version = "0.3.3";
src = fetchFromGitHub {
owner = "ManneW";
repo = "vilfo-api-client-python";
rev = "v${version}";
sha256 = "1gy5gpsg99rcm1cc3m30232za00r9i46sp74zpd12p3vzz1wyyqf";
};
});
# Pinned due to API changes ~1.0 # Pinned due to API changes ~1.0
vultr = super.vultr.overridePythonAttrs (oldAttrs: rec { vultr = super.vultr.overridePythonAttrs (oldAttrs: rec {
version = "0.1.2"; version = "0.1.2";
@ -299,7 +278,7 @@ let
}) })
]; ];
python = python3.override { python = python311.override {
packageOverrides = lib.composeManyExtensions (defaultOverrides ++ [ packageOverrides ]); packageOverrides = lib.composeManyExtensions (defaultOverrides ++ [ packageOverrides ]);
}; };
@ -317,7 +296,7 @@ let
extraBuildInputs = extraPackages python.pkgs; extraBuildInputs = extraPackages python.pkgs;
# Don't forget to run parse-requirements.py after updating # Don't forget to run parse-requirements.py after updating
hassVersion = "2023.5.4"; hassVersion = "2023.6.0";
in python.pkgs.buildPythonApplication rec { in python.pkgs.buildPythonApplication rec {
pname = "homeassistant"; pname = "homeassistant";
@ -333,7 +312,7 @@ in python.pkgs.buildPythonApplication rec {
# Primary source is the pypi sdist, because it contains translations # Primary source is the pypi sdist, because it contains translations
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-mRiRKMafRkgAOshH/5i6yj379FEzZgXhkdkK557sMaQ="; hash = "sha256-dEszA95EIwGMR2Ztpe7P8weh4FbqGJBkso7nCvTkPDc=";
}; };
# Secondary source is git for tests # Secondary source is git for tests
@ -341,10 +320,10 @@ in python.pkgs.buildPythonApplication rec {
owner = "home-assistant"; owner = "home-assistant";
repo = "core"; repo = "core";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-r28BhC6lBIoxu7Wp/1h+qgPEDaUCqH4snyKk/h/vgyQ="; hash = "sha256-0rhjh/mIevRdisWvTSx9QQjHdY7nMVpuGyTr9sChipk=";
}; };
nativeBuildInputs = with python3.pkgs; [ nativeBuildInputs = with python.pkgs; [
setuptools setuptools
]; ];
@ -500,7 +479,7 @@ in python.pkgs.buildPythonApplication rec {
getPackages getPackages
python python
supportedComponentsWithTests; supportedComponentsWithTests;
pythonPath = python3.pkgs.makePythonPath (componentBuildInputs ++ extraBuildInputs); pythonPath = python.pkgs.makePythonPath (componentBuildInputs ++ extraBuildInputs);
frontend = python.pkgs.home-assistant-frontend; frontend = python.pkgs.home-assistant-frontend;
intents = python.pkgs.home-assistant-intents; intents = python.pkgs.home-assistant-intents;
tests = { tests = {

4
pkgs/servers/home-assistant/frontend.nix
View file

@ -4,7 +4,7 @@ buildPythonPackage rec {
# the frontend version corresponding to a specific home-assistant version can be found here # the frontend version corresponding to a specific home-assistant version can be found here
# https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
pname = "home-assistant-frontend"; pname = "home-assistant-frontend";
version = "20230503.3"; version = "20230607.0";
format = "wheel"; format = "wheel";
src = fetchPypi { src = fetchPypi {
@ -12,7 +12,7 @@ buildPythonPackage rec {
pname = "home_assistant_frontend"; pname = "home_assistant_frontend";
dist = "py3"; dist = "py3";
python = "py3"; python = "py3";
hash = "sha256-BOSXRpHgHUygrbd7LaGHFj5aM+Bfp5VkB791tJ5jCwU="; hash = "sha256-O3hAF3QgZHm6q+manxlqWZLlSDxHMr86B3GdwMClxEk=";
}; };
# there is nothing to strip in this package # there is nothing to strip in this package

9
pkgs/servers/home-assistant/intents.nix
View file

@ -19,7 +19,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "home-assistant-intents"; pname = "home-assistant-intents";
version = "2023.4.26"; version = "2023.6.5";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.9"; disabled = pythonOlder "3.9";
@ -28,11 +28,16 @@ buildPythonPackage rec {
owner = "home-assistant"; owner = "home-assistant";
repo = "intents"; repo = "intents";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-l22+scT/4qIU5qWlWURr5wVEBoWNXGqYEaS3IVwG1Zs="; hash = "sha256-ZfPOxTFPQNdZ3Tq8p410RHlLGej+FOqhafD+91MRbRo=";
}; };
sourceRoot = "source/package"; sourceRoot = "source/package";
postPatch = ''
substituteInPlace pyproject.toml \
--replace "2023.4.26" "${version}"
'';
nativeBuildInputs = [ nativeBuildInputs = [
hassil hassil
jinja2 jinja2

4
pkgs/servers/home-assistant/stubs.nix
View file

@ -8,7 +8,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "homeassistant-stubs"; pname = "homeassistant-stubs";
version = "2023.5.4"; version = "2023.6.0";
format = "pyproject"; format = "pyproject";
disabled = python.version != home-assistant.python.version; disabled = python.version != home-assistant.python.version;
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "KapJI"; owner = "KapJI";
repo = "homeassistant-stubs"; repo = "homeassistant-stubs";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-2vexK+b+Zy1hvOgjOnsyUMxn2zdu6Gr3Sdk6XqEQRH4="; hash = "sha256-efwrTHWc4m4biP7b39OU1GRifoKm49hEUTtIfrNGUeA=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

1
pkgs/servers/home-assistant/tests.nix
View file

@ -87,7 +87,6 @@ in lib.listToAttrs (map (component: lib.nameValuePair component (
dontUsePytestXdist = true; dontUsePytestXdist = true;
pytestFlagsArray = lib.remove "tests" old.pytestFlagsArray pytestFlagsArray = lib.remove "tests" old.pytestFlagsArray
++ [ "--numprocesses=2" ]
++ extraPytestFlagsArray.${component} or [ ] ++ extraPytestFlagsArray.${component} or [ ]
++ [ "tests/components/${component}" ]; ++ [ "tests/components/${component}" ];

6
pkgs/servers/monitoring/grafana-agent/default.nix
View file

@ -10,16 +10,16 @@
buildGoModule rec { buildGoModule rec {
pname = "grafana-agent"; pname = "grafana-agent";
version = "0.33.2"; version = "0.34.0";
src = fetchFromGitHub { src = fetchFromGitHub {
rev = "v${version}"; rev = "v${version}";
owner = "grafana"; owner = "grafana";
repo = "agent"; repo = "agent";
hash = "sha256-9/1EzRIuWpXbEVA6WIy5WAHFkJgPoqABLfvgA7DB/oU="; hash = "sha256-OIvLgI853qQ4Nc8xBKfwWKohyW/b53UBxpNauAgOS48=";
}; };
vendorHash = "sha256-ZeSK5sTU/ey0pe303Y5eZi7D25lTXaQHJsPLDQ/tB+s="; vendorHash = "sha256-BfEnMGP3IMtJwOjZRFpNc58PaQ116U/p9jRsiGdIpCQ=";
proxyVendor = true; # darwin/linux hash mismatch proxyVendor = true; # darwin/linux hash mismatch
ldflags = let ldflags = let

5
pkgs/servers/web-apps/wiki-js/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "wiki-js"; pname = "wiki-js";
version = "2.5.298"; version = "2.5.299";
src = fetchurl { src = fetchurl {
url = "https://github.com/Requarks/wiki/releases/download/v${version}/${pname}.tar.gz"; url = "https://github.com/Requarks/wiki/releases/download/v${version}/${pname}.tar.gz";
sha256 = "sha256-O7KQ134zh9ullYyQZimmxfdRwXeHkD8aAhy/pRzIjxo="; sha256 = "sha256-GYe05dbR8RwCzPedeCMUQTWZ51roM/V2jUPPv7o7UEU=";
}; };
# Implements nodejs 18 support as it's not planned to fix this before # Implements nodejs 18 support as it's not planned to fix this before
@ -29,6 +29,7 @@ stdenv.mkDerivation rec {
# [1] https://github.com/requarks/wiki/discussions/6388 # [1] https://github.com/requarks/wiki/discussions/6388
# [2] https://nodejs.org/en/blog/release/v17.0.0 # [2] https://nodejs.org/en/blog/release/v17.0.0
# [3] https://nodejs.org/en/blog/release/v18.0.0 # [3] https://nodejs.org/en/blog/release/v18.0.0
patches = [ ./drop-node-check.patch ];
nativeBuildInputs = [ jq moreutils ]; nativeBuildInputs = [ jq moreutils ];
postPatch = '' postPatch = ''
# Dirty hack to implement nodejs-18 support. # Dirty hack to implement nodejs-18 support.

19
pkgs/servers/web-apps/wiki-js/drop-node-check.patch Normal file
View file

@ -0,0 +1,19 @@
diff --git a/server/index.js b/server/index.js
index 7cdb4f80..161ebeb7 100644
--- a/server/index.js
+++ b/server/index.js
@@ -8,14 +8,6 @@ const { nanoid } = require('nanoid')
const { DateTime } = require('luxon')
const { gte } = require('semver')
-// ----------------------------------------
-// Check Node.js version
-// ----------------------------------------
-if (gte(process.version, '18.0.0')) {
- console.error('You\'re using an unsupported Node.js version. Please read the requirements.')
- process.exit(1)
-}
-
// ----------------------------------------
// Init WIKI instance
// ----------------------------------------

2
pkgs/stdenv/darwin/default.nix
View file

@ -651,7 +651,7 @@ rec {
darwin = super.darwin.overrideScope (_: _: { darwin = super.darwin.overrideScope (_: _: {
inherit (darwin) dyld ICU Libsystem Csu libiconv rewrite-tbd; inherit (darwin) dyld ICU Libsystem Csu libiconv rewrite-tbd;
} // lib.optionalAttrs (super.stdenv.targetPlatform == localSystem) { } // lib.optionalAttrs (super.stdenv.targetPlatform == localSystem) {
inherit (darwin) binutils binutils-unwrapped cctools; inherit (darwin) binutils binutils-unwrapped cctools-port;
}); });
} // lib.optionalAttrs (super.stdenv.targetPlatform == localSystem) { } // lib.optionalAttrs (super.stdenv.targetPlatform == localSystem) {
inherit llvm; inherit llvm;

1044
pkgs/tools/admin/google-cloud-sdk/components.json
View file

File diff suppressed because it is too large Load diff

Some files were not shown because too many files have changed in this diff Show more