Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2024-09-17 12:05:50 +00:00 committed by GitHub
commit 73cf025711
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
67 changed files with 1910 additions and 4565 deletions

View File

@ -64,7 +64,7 @@ let
src = fetchurl {
url = "https://github.com/irccloud/irccloud-desktop/releases/download/v${version}/IRCCloud-${version}-linux-x86_64.AppImage";
sha256 = "sha256-/hMPvYdnVB1XjKgU2v47HnVvW4+uC3rhRjbucqin4iI=";
hash = "sha256-/hMPvYdnVB1XjKgU2v47HnVvW4+uC3rhRjbucqin4iI=";
};
in appimageTools.wrapType2 {
inherit pname version src;
@ -100,7 +100,7 @@ let
src = fetchurl {
url = "https://github.com/irccloud/irccloud-desktop/releases/download/v${version}/IRCCloud-${version}-linux-x86_64.AppImage";
sha256 = "sha256-/hMPvYdnVB1XjKgU2v47HnVvW4+uC3rhRjbucqin4iI=";
hash = "sha256-/hMPvYdnVB1XjKgU2v47HnVvW4+uC3rhRjbucqin4iI=";
};
appimageContents = appimageTools.extract {
@ -141,7 +141,7 @@ let
src = fetchurl {
url = "https://github.com/irccloud/irccloud-desktop/releases/download/v${version}/IRCCloud-${version}-linux-x86_64.AppImage";
sha256 = "sha256-/hMPvYdnVB1XjKgU2v47HnVvW4+uC3rhRjbucqin4iI=";
hash = "sha256-/hMPvYdnVB1XjKgU2v47HnVvW4+uC3rhRjbucqin4iI=";
};
appimageContents = appimageTools.extract {

View File

@ -17,6 +17,7 @@ ghc.section.md
gnome.section.md
haredo.section.md
installShellFiles.section.md
just.section.md
libiconv.section.md
libxml2.section.md
meson.section.md

23
doc/hooks/just.section.md Normal file
View File

@ -0,0 +1,23 @@
# `just` {#just-hook}
This setup hook attempts to use [the `just` command runner](https://just.systems/man/en/) to build, check, and install the package. The hook overrides `buildPhase`, `checkPhase`, and `installPhase` by default.
[]{#just-hook-justFlags} The `justFlags` variable can be set to a list of strings to add additional flags passed to all invocations of `just`.
## `buildPhase` {#just-hook-buildPhase}
This phase attempts to invoke `just` with [the default recipe](https://just.systems/man/en/chapter_23.html).
[]{#just-hook-dontUseJustBuild} This behavior can be disabled by setting `dontUseJustBuild` to `true`.
## `checkPhase` {#just-hook-checkPhase}
This phase attempts to invoke the `just test` recipe, if it is available. This can be overrided by setting `checkTarget` to a string.
[]{#just-hook-dontUseJustCheck} This behavior can be disabled by setting `dontUseJustCheck` to `true`.
## `installPhase` {#just-hook-installPhase}
This phase attempts to invoke the `just install` recipe.
[]{#just-hook-dontUseJustInstall} This behavior can be disabled by setting `dontUseJustInstall` to `true`.

View File

@ -23,7 +23,7 @@ The recommended way of defining a derivation for a Coq library, is to use the `c
* if it is a string of the form `owner:branch` then it tries to download the `branch` of owner `owner` for a project of the same name using the same vcs, and the `version` attribute of the resulting derivation is set to `"dev"`, additionally if the owner is not provided (i.e. if the `owner:` prefix is missing), it defaults to the original owner of the package (see below),
* if it is a string of the form `"#N"`, and the domain is github, then it tries to download the current head of the pull request `#N` from github,
* `defaultVersion` (optional). Coq libraries may be compatible with some specific versions of Coq only. The `defaultVersion` attribute is used when no `version` is provided (or if `version = null`) to select the version of the library to use by default, depending on the context. This selection will mainly depend on a `coq` version number but also possibly on other packages versions (e.g. `mathcomp`). If its value ends up to be `null`, the package is marked for removal in end-user `coqPackages` attribute set.
* `release` (optional, defaults to `{}`), lists all the known releases of the library and for each of them provides an attribute set with at least a `sha256` attribute (you may put the empty string `""` in order to automatically insert a fake sha256, this will trigger an error which will allow you to find the correct sha256), each attribute set of the list of releases also takes optional overloading arguments for the fetcher as below (i.e.`domain`, `owner`, `repo`, `rev` assuming the default fetcher is used) and optional overrides for the result of the fetcher (i.e. `version` and `src`).
* `release` (optional, defaults to `{}`), lists all the known releases of the library and for each of them provides an attribute set with at least a `hash` attribute (you may put the empty string `""` in order to automatically insert a fake hash, this will trigger an error which will allow you to find the correct hash), each attribute set of the list of releases also takes optional overloading arguments for the fetcher as below (i.e.`domain`, `owner`, `repo`, `rev` assuming the default fetcher is used) and optional overrides for the result of the fetcher (i.e. `version` and `src`).
* `fetcher` (optional, defaults to a generic fetching mechanism supporting github or gitlab based infrastructures), is a function that takes at least an `owner`, a `repo`, a `rev`, and a `hash` and returns an attribute set with a `version` and `src`.
* `repo` (optional, defaults to the value of `pname`),
* `owner` (optional, defaults to `"coq-community"`).
@ -69,15 +69,15 @@ mkCoqDerivation {
{ cases = [ (isEq "8.6") (range "1.6" "1.7") ]; out = "1.1"; }
] null;
release = {
"1.5.2".sha256 = "15aspf3jfykp1xgsxf8knqkxv8aav2p39c2fyirw7pwsfbsv2c4s";
"1.5.1".sha256 = "13nlfm2wqripaq671gakz5mn4r0xwm0646araxv0nh455p9ndjs3";
"1.5.0".sha256 = "064rvc0x5g7y1a0nip6ic91vzmq52alf6in2bc2dmss6dmzv90hw";
"1.5.0".rev = "1.5";
"1.4".sha256 = "0vnkirs8iqsv8s59yx1fvg1nkwnzydl42z3scya1xp1b48qkgn0p";
"1.3".sha256 = "0l3vi5n094nx3qmy66hsv867fnqm196r8v605kpk24gl0aa57wh4";
"1.2".sha256 = "1mh1w339dslgv4f810xr1b8v2w7rpx6fgk9pz96q0fyq49fw2xcq";
"1.1".sha256 = "1q8alsm89wkc0lhcvxlyn0pd8rbl2nnxg81zyrabpz610qqjqc3s";
"1.0".sha256 = "1qmbxp1h81cy3imh627pznmng0kvv37k4hrwi2faa101s6bcx55m";
"1.5.2".hash = "sha256-mjCx9XKa38Nz9E6wNK7YSqHdJ7YTua5fD3d6J4e7WpU=";
"1.5.1".hash = "sha256-Q8tm0y2FQAt2V1kZYkDlHWRia/lTvXAMVjdmzEV11I4=";
"1.5.0".hash = "sha256-HIK0f21G69oEW8JG46gSBde/Q2LR3GiBCv680gHbmRg=";
"1.5.0".rev = "1.5";
"1.4".hash = "sha256-F9g3MSIr3B6UZ3p8QWjz3/Jpw9sudJ+KRlvjiHSO024=";
"1.3".hash = "sha256-BPJTlAL0ETHvLMBslE0KFVt3DNoaGuMrHt2SBGyJe1A=";
"1.2".hash = "sha256-mHXBXSLYO4BN+jfN50y/+XCx0Qq5g4Ac2Y/qlsbgAdY=";
"1.1".hash = "sha256-ejAsMQbB/LtU9j+g160VdGXULrCe9s0gBWzyhKqmCuE=";
"1.0".hash = "sha256-tZTOltEBBKWciDxDMs/Ye4Jnq/33CANrHJ4FBMPtq+I=";
};
propagatedBuildInputs =
@ -126,7 +126,7 @@ For example, here is how you could locally add a new release of the `multinomial
coqPackages.lib.overrideCoqDerivation
{
defaultVersion = "2.0";
release."2.0".sha256 = "1lq8x86vd3vqqh2yq6hvyagpnhfq5wmk5pg2z0xq7b7dbbbhyfkk";
release."2.0".hash = "sha256-czoP11rtrIM7+OLdMisv2EF7n/IbGuwFxHiPtg3qCNM=";
}
coqPackages.multinomials
```

View File

@ -219,10 +219,10 @@ stdenv.mkDerivation {
# don't do any fixup
dontFixup = true;
outputHashAlgo = "sha256";
outputHashAlgo = null;
outputHashMode = "recursive";
# replace this with the correct SHA256
outputHash = lib.fakeSha256;
outputHash = lib.fakeHash;
}
```

View File

@ -52,7 +52,7 @@ pkgs.linuxPackages_custom {
version = "6.1.55";
src = pkgs.fetchurl {
url = "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-${version}.tar.xz";
hash = "sha256:1h0mzx52q9pvdv7rhnvb8g68i7bnlc9rf8gy9qn4alsxq4g28zm8";
hash = "sha256-qH4kHsFdU0UsTv4hlxOjdp2IzENrW5jPbvsmLEr/FcA=";
};
configfile = ./path_to_config_file;
}
@ -67,7 +67,7 @@ pkgs.linuxPackages_custom {
modDirVersion = "6.1.55";
src = pkgs.fetchurl {
url = "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-${modDirVersion}.tar.xz";
hash = "sha256:1h0mzx52q9pvdv7rhnvb8g68i7bnlc9rf8gy9qn4alsxq4g28zm8";
hash = "sha256-qH4kHsFdU0UsTv4hlxOjdp2IzENrW5jPbvsmLEr/FcA=";
};
configfile = ./path_to_config_file;
}

View File

@ -15529,6 +15529,12 @@
githubId = 39134647;
name = "Oliver Koss";
};
oliver-ni = {
email = "nixos@oliver.ni";
github = "oliver-ni";
githubId = 20295134;
name = "Oliver Ni";
};
ollieB = {
github = "oliverbunting";
githubId = 1237862;
@ -20739,7 +20745,7 @@
};
tfc = {
email = "jacek@galowicz.de";
matrix = "@jonge:ukvly.org";
matrix = "@tfc:matrix.org";
github = "tfc";
githubId = 29044;
name = "Jacek Galowicz";

View File

@ -10,13 +10,15 @@ let
cfg = config.hardware.nvidia;
useOpenModules = cfg.open == true;
pCfg = cfg.prime;
syncCfg = pCfg.sync;
offloadCfg = pCfg.offload;
reverseSyncCfg = pCfg.reverseSync;
primeEnabled = syncCfg.enable || reverseSyncCfg.enable || offloadCfg.enable;
busIDType = lib.types.strMatching "([[:print:]]+[\:\@][0-9]{1,3}\:[0-9]{1,2}\:[0-9])?";
ibtSupport = cfg.open || (nvidia_x11.ibtSupport or false);
ibtSupport = useOpenModules || (nvidia_x11.ibtSupport or false);
settingsFormat = pkgs.formats.keyValue { };
in
{
@ -257,17 +259,19 @@ in
open = lib.mkOption {
example = true;
description = "Whether to enable the open source NVIDIA kernel module.";
type = lib.types.bool;
type = lib.types.nullOr lib.types.bool;
default = if lib.versionOlder nvidia_x11.version "560" then false else null;
defaultText = lib.literalExpression ''
lib.mkIf (lib.versionOlder config.hardware.nvidia.package.version "560") false
if lib.versionOlder config.hardware.nvidia.package.version "560" then false else null
'';
};
gsp.enable = lib.mkEnableOption ''
the GPU System Processor (GSP) on the video card
'' // {
default = useOpenModules || lib.versionAtLeast nvidia_x11.version "555";
defaultText = lib.literalExpression ''
config.hardware.nvidia.open || lib.versionAtLeast config.hardware.nvidia.package.version "555"
config.hardware.nvidia.open == true || lib.versionAtLeast config.hardware.nvidia.package.version "555"
'';
};
};
@ -287,6 +291,13 @@ in
assertion = !(nvidiaEnabled && cfg.datacenter.enable);
message = "You cannot configure both X11 and Data Center drivers at the same time.";
}
{
assertion = cfg.open != null;
message = ''
You must configure `hardware.nvidia.open` on NVIDIA driver versions >= 560.
It is suggested to use the open source kernel modules on Turing or later GPUs (RTX series, GTX 16xx), and the closed source modules otherwise.
'';
}
];
boot = {
blacklistedKernelModules = [
@ -318,9 +329,6 @@ in
extraPackages32 = [ nvidia_x11.lib32 ];
};
environment.systemPackages = [ nvidia_x11.bin ];
hardware.nvidia.open = lib.mkIf (lib.versionOlder nvidia_x11.version "560") (lib.mkDefault false);
hardware.nvidia.gsp.enable = lib.mkDefault (cfg.open || lib.versionAtLeast nvidia_x11.version "555");
})
# X11
@ -384,12 +392,12 @@ in
}
{
assertion = cfg.open -> (cfg.package ? open);
assertion = useOpenModules -> (cfg.package ? open);
message = "This version of NVIDIA driver does not provide a corresponding opensource kernel driver.";
}
{
assertion = cfg.open -> cfg.gsp.enable;
assertion = useOpenModules -> cfg.gsp.enable;
message = "The GSP cannot be disabled when using the opensource kernel driver.";
}
@ -592,7 +600,7 @@ in
"L+ /run/nvidia-docker/extras/bin/nvidia-persistenced - - - - ${nvidia_x11.persistenced}/origBin/nvidia-persistenced";
boot = {
extraModulePackages = if cfg.open then [ nvidia_x11.open ] else [ nvidia_x11.bin ];
extraModulePackages = if useOpenModules then [ nvidia_x11.open ] else [ nvidia_x11.bin ];
# nvidia-uvm is required by CUDA applications.
kernelModules =
lib.optionals config.services.xserver.enable [
@ -603,14 +611,14 @@ in
# With the open driver, nvidia-uvm does not automatically load as
# a softdep of the nvidia module, so we explicitly load it for now.
# See https://github.com/NixOS/nixpkgs/issues/334180
++ lib.optionals (config.services.xserver.enable && cfg.open) [ "nvidia_uvm" ];
++ lib.optionals (config.services.xserver.enable && useOpenModules) [ "nvidia_uvm" ];
# If requested enable modesetting via kernel parameters.
kernelParams =
lib.optional (offloadCfg.enable || cfg.modesetting.enable) "nvidia-drm.modeset=1"
++ lib.optional ((offloadCfg.enable || cfg.modesetting.enable) && lib.versionAtLeast nvidia_x11.version "545") "nvidia-drm.fbdev=1"
++ lib.optional cfg.powerManagement.enable "nvidia.NVreg_PreserveVideoMemoryAllocations=1"
++ lib.optional cfg.open "nvidia.NVreg_OpenRmEnableUnsupportedGpus=1"
++ lib.optional useOpenModules "nvidia.NVreg_OpenRmEnableUnsupportedGpus=1"
++ lib.optional (config.boot.kernelPackages.kernel.kernelAtLeast "6.2" && !ibtSupport) "ibt=off";
# enable finegrained power management

View File

@ -96,6 +96,7 @@ in
security.pam.services.ly = {
startSession = true;
unixAuth = true;
enableGnomeKeyring = lib.mkDefault config.services.gnome.gnome-keyring.enable;
};
environment = {

View File

@ -144,6 +144,42 @@ Auto updates for Nextcloud apps can be enabled using
To work around that, please make sure that all directories in question
are owned by `nextcloud:nextcloud`.
- **`Failed to open stream: No such file or directory` after deploys**
Symptoms are errors like this after a deployment that disappear after
a few minutes:
```
Warning: file_get_contents(/run/secrets/nextcloud_db_password): Failed to open stream: No such file or directory in /nix/store/lqw657xbh6h67ccv9cgv104qhcs1i2vw-nextcloud-config.php on line 11
Warning: http_response_code(): Cannot set response code - headers already sent (output started at /nix/store/lqw657xbh6h67ccv9cgv104qhcs1i2vw-nextcloud-config.php:11) in /nix/store/ikxpaq7kjdhpr4w7cgl1n28kc2gvlhg6-nextcloud-29.0.7/lib/base.php on line 639
Cannot decode /run/secrets/nextcloud_secrets, because: Syntax error
```
This can happen if [](#opt-services.nextcloud.secretFile) or
[](#opt-services.nextcloud.config.dbpassFile) are managed by
[sops-nix](https://github.com/Mic92/sops-nix/).
Here, `/run/secrets/nextcloud_secrets` is a symlink to
`/run/secrets.d/N/nextcloud_secrets`. The `N` will be incremented
when the sops-nix activation script runs, i.e.
`/run/secrets.d/N` doesn't exist anymore after a deploy,
only `/run/secrets.d/N+1`.
PHP maintains a [cache for `realpath`](https://www.php.net/manual/en/ini.core.php#ini.realpath-cache-size)
that still resolves to the old path which is causing
the `No such file or directory` error. Interestingly,
the cache isn't used for `file_exists` which is why this warning
comes instead of the error from `nix_read_secret` in
`override.config.php`.
One option to work around this is to turn off the cache by setting
the cache size to zero:
```nix
services.nextcloud.phpOptions."realpath_cache_size" = "0";
```
## Using an alternative webserver as reverse-proxy (e.g. `httpd`) {#module-services-nextcloud-httpd}
By default, `nginx` is used as reverse-proxy for `nextcloud`.

View File

@ -35,7 +35,7 @@ let
machine.wait_for_text('Your Subscription list is currently empty')
machine.screenshot("main.png")
machine.send_key("ctrl-comma")
machine.wait_for_text('General Settings', timeout=30)
machine.wait_for_text('Data Settings', timeout=60)
machine.screenshot("preferences.png")
'';
});

View File

@ -17,13 +17,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "mympd";
version = "17.0.3";
version = "17.0.4";
src = fetchFromGitHub {
owner = "jcorporation";
repo = "myMPD";
rev = "v${finalAttrs.version}";
sha256 = "sha256-DtGNwxlXYCorD/c61nqtcocMqt4IG+LuTAdwbKlvp/Y=";
sha256 = "sha256-mtAMvaC8W9/o+ccHyvJRZ5Stq82m6IgXk/jOcxaGSXA=";
};
nativeBuildInputs = [

View File

@ -13,12 +13,12 @@ let
sha256Hash = "sha256-dFFogg6YmpCF/4QtR85UFAfbCd97irIHcPbqieQabpI=";
};
betaVersion = {
version = "2024.2.1.6"; # "Android Studio Ladybug | 2024.2.1 Beta 1"
sha256Hash = "sha256-o/otfwZu+MUy9tbLt1iZWmBPB7YVx5aMjA1KcIvMD3U=";
version = "2024.2.1.7"; # "Android Studio Ladybug | 2024.2.1 Beta 2"
sha256Hash = "sha256-YNUtRsKwXHfb7McJmTTT39/wW1rHjzw4kFQRwa12kJE=";
};
latestVersion = {
version = "2024.2.1.5"; # "Android Studio Ladybug | 2024.2.1 Canary 9"
sha256Hash = "sha256-0F07jcsutarm464ahgo9hDh1jHo2aDEpIz5r9bxmNZw=";
version = "2024.2.2.2"; # "Android Studio Ladybug Feature Drop | 2024.2.2 Canary 2"
sha256Hash = "sha256-TSjKJ4gAqZlycMP1or8MV+Il+KOQJL/F1kUKQr6/rSw=";
};
in {
# Attributes are named by their corresponding release channels

View File

@ -10198,12 +10198,12 @@ final: prev:
sg-nvim = buildVimPlugin {
pname = "sg.nvim";
version = "2024-09-09";
version = "2024-09-17";
src = fetchFromGitHub {
owner = "sourcegraph";
repo = "sg.nvim";
rev = "a7e060428897d1f37f585cedc355d34e0b8e2a58";
sha256 = "1n8rg39gx2mcfw0fgyqnawg2b5cky8zchxigzmyng6n134fg5s42";
rev = "76c97d91f8d8818a4fcf14817fadd98412aa44c8";
sha256 = "sha256-MxFr59crdc9WlYwydM1dI1NU+5qB06xh+hFnNUuBc4c=";
};
meta.homepage = "https://github.com/sourcegraph/sg.nvim/";
};
@ -11765,6 +11765,18 @@ final: prev:
meta.homepage = "https://github.com/jgdavey/tslime.vim/";
};
tssorter-nvim = buildVimPlugin {
pname = "tssorter.nvim";
version = "2024-08-16";
src = fetchFromGitHub {
owner = "mtrajano";
repo = "tssorter.nvim";
rev = "74fa4102cb3272dcc8fd5696fd3240358f19c090";
sha256 = "1y64w5aggh0k5xf0y8xsjbkzinn8gx2qhhqlww89k43dblq07pa4";
};
meta.homepage = "https://github.com/mtrajano/tssorter.nvim/";
};
tsuquyomi = buildVimPlugin {
pname = "tsuquyomi";
version = "2023-10-03";
@ -17975,5 +17987,17 @@ final: prev:
meta.homepage = "https://github.com/jhradilek/vim-snippets/";
};
tailwind-tools-nvim = buildVimPlugin {
pname = "tailwind-tools.nvim";
version = "2024-09-15";
src = fetchFromGitHub {
owner = "luckasRanarison";
repo = "tailwind-tools.nvim";
rev = "41e901e7b4470082b5388b8385249632642c2510";
hash = "sha256-eDog1SXn1qS9ZjeG5709BU2qxzOUqa6V+gbBkW1xbqw=";
};
meta.homepage = "https://github.com/luckasRanarison/tailwind-tools.nvim";
};
}

View File

@ -1524,7 +1524,7 @@
pname = "sg-nvim-rust";
inherit (old) version src;
cargoHash = "sha256-dqa5Rd3NeOSqv18F1QdkrWEypJ0bvVwIDwrMOyBVsDM=";
cargoHash = "sha256-7Bo0DSRqxA7kgNuyuWw24r3PsP92y9h98SHFtIhG+Gs=";
nativeBuildInputs = [ pkg-config ];
@ -1553,10 +1553,6 @@
mkdir -p $out/target/debug
ln -s ${sg-nvim-rust}/{bin,lib}/* $out/target/debug
'';
# Build fails with rust > 1.80
# https://github.com/sourcegraph/sg.nvim/issues/259
meta.broken = true;
});
skim = buildVimPlugin {
@ -1575,12 +1571,12 @@
sniprun =
let
version = "1.3.15";
version = "1.3.16";
src = fetchFromGitHub {
owner = "michaelb";
repo = "sniprun";
rev = "refs/tags/v${version}";
hash = "sha256-8N+KUawQ6RI6sG8m9wpvJTMQyJ5j/43PRkrTPrWAREQ=";
hash = "sha256-2rVeBUkdLXUiHkd8slyiLTYQBKwgMQvIi/uyCToVBYA=";
};
sniprun-bin = rustPlatform.buildRustPackage {
pname = "sniprun-bin";
@ -1590,7 +1586,7 @@
darwin.apple_sdk.frameworks.Security
];
cargoHash = "sha256-bLki+6uMKJtk/bu+LNf2E1m/HpEG8zmnM3JI89IjmNs=";
cargoHash = "sha256-eZcWS+DWec0V9G6hBnZRUNcb3uZeSiBhn4Ed9KodFV8=";
nativeBuildInputs = [ makeWrapper ];
@ -1615,7 +1611,7 @@
meta = {
homepage = "https://github.com/michaelb/sniprun/";
changelog = "https://github.com/michaelb/sniprun/releases/tag/v${version}";
changelog = "https://github.com/michaelb/sniprun/blob/v${version}/CHANGELOG.md";
maintainers = with lib.maintainers; [ GaetanLepage ];
};
};
@ -1801,6 +1797,10 @@
nvimRequireCheck = "todo-comments";
};
tssorter-nvim = super.tssorter-nvim.overrideAttrs {
dependencies = with self; [ nvim-treesitter ];
};
tup =
let
# Based on the comment at the top of https://github.com/gittup/tup/blob/master/contrib/syntax/tup.vim

View File

@ -1,15 +1,15 @@
diff --git a/lua/sniprun.lua b/lua/sniprun.lua
index fe29d1e..92d4729 100644
index 49be442..1834566 100644
--- a/lua/sniprun.lua
+++ b/lua/sniprun.lua
@@ -4,9 +4,7 @@ M.custom_highlight=false
@@ -3,9 +3,7 @@ M.ping_anwsered = 0
M.info_floatwin = {}
-- See https://github.com/tjdevries/rofl.nvim/blob/632c10f2ec7c56882a3f7eda8849904bcac6e8af/lua/rofl.lua
-local binary_path = vim.fn.fnamemodify(
- vim.api.nvim_get_runtime_file("lua/sniprun.lua", false)[1], ":h:h")
- .. "/target/release/sniprun"
- vim.api.nvim_get_runtime_file("lua/sniprun.lua", false)[1], ":h:h")
- .. "/target/release/sniprun"
+local binary_path = "@sniprun_bin@/bin/sniprun"
local sniprun_path = vim.fn.fnamemodify( vim.api.nvim_get_runtime_file("lua/sniprun.lua", false)[1], ":p:h") .. "/.."
local sniprun_path = vim.fn.fnamemodify(vim.api.nvim_get_runtime_file("lua/sniprun.lua", false)[1], ":p:h") .. "/.."

View File

@ -919,6 +919,7 @@ https://github.com/godlygeek/tabular/,,
https://github.com/AndrewRadev/tagalong.vim/,,
https://github.com/preservim/tagbar/,,
https://github.com/vim-scripts/taglist.vim/,,
https://github.com/luckasRanarison/tailwind-tools.nvim/,HEAD,
https://github.com/themaxmarchuk/tailwindcss-colors.nvim/,HEAD,
https://github.com/wellle/targets.vim/,,
https://github.com/tools-life/taskwiki/,,
@ -987,6 +988,7 @@ https://github.com/Pocco81/true-zen.nvim/,,
https://github.com/tesaguri/trust.vim/,HEAD,
https://github.com/folke/ts-comments.nvim/,HEAD,
https://github.com/jgdavey/tslime.vim/,,
https://github.com/mtrajano/tssorter.nvim/,HEAD,
https://github.com/Quramy/tsuquyomi/,,
https://github.com/folke/twilight.nvim/,,
https://github.com/pmizio/typescript-tools.nvim/,,

View File

@ -42,6 +42,7 @@
, mypaint-brushes1
, libwebp
, libheif
, libxslt
, libgudev
, openexr
, desktopToDarwinBundle
@ -76,6 +77,14 @@ in stdenv.mkDerivation (finalAttrs: {
# Use absolute paths instead of relying on PATH
# to make sure plug-ins are loaded by the correct interpreter.
./hardcode-plugin-interpreters.patch
# GIMP queries libheif.pc for builtin encoder/decoder support to determine if AVIF/HEIC files are supported
# (see https://gitlab.gnome.org/GNOME/gimp/-/blob/a8b1173ca441283971ee48f4778e2ffd1cca7284/configure.ac?page=2#L1846-1852)
# These variables have been removed since libheif 1.18.0
# (see https://github.com/strukturag/libheif/commit/cf0d89c6e0809427427583290547a7757428cf5a)
# This has already been fixed for the upcoming GIMP 3, but the fix has not been backported to 2.x yet
# (see https://gitlab.gnome.org/GNOME/gimp/-/issues/9080)
./force-enable-libheif.patch
];
nativeBuildInputs = [
@ -85,6 +94,7 @@ in stdenv.mkDerivation (finalAttrs: {
gettext
makeWrapper
gtk-doc
libxslt
] ++ lib.optionals stdenv.isDarwin [
desktopToDarwinBundle
];

View File

@ -0,0 +1,22 @@
diff --git a/configure.ac b/configure.ac
index 48c3c77892..3189781817 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1843,13 +1843,13 @@ can_export_heic=no
can_import_avif=no
can_export_avif=no
if test "x$have_libheif" = xyes; then
- can_import_heic=`$PKG_CONFIG --variable=builtin_h265_decoder libheif`
- can_export_heic=`$PKG_CONFIG --variable=builtin_h265_encoder libheif`
+ can_import_heic=yes
+ can_export_heic=yes
if test "x$can_import_heic" = xyes; then
MIME_TYPES="$MIME_TYPES;image/heif;image/heic"
fi
- can_import_avif=`$PKG_CONFIG --variable=builtin_avif_decoder libheif`
- can_export_avif=`$PKG_CONFIG --variable=builtin_avif_encoder libheif`
+ can_import_avif=yes
+ can_export_avif=yes
if test "x$can_import_avif" = xyes; then
MIME_TYPES="$MIME_TYPES;image/avif"
fi

View File

@ -4,11 +4,11 @@ let
in
stdenv.mkDerivation rec {
pname = "rocketchat-desktop";
version = "4.0.2";
version = "4.1.0";
src = fetchurl {
url = "https://github.com/RocketChat/Rocket.Chat.Electron/releases/download/${version}/rocketchat-${version}-linux-amd64.deb";
hash = "sha256-E2bIFv0oO9mZ90iTHdB3jczr+FEJBCV5r1ucsd6ulGE=";
hash = "sha256-SMpcsRKxx51O7cagDFIrp70QiAHaoAU5NhLHtog647g=";
};
nativeBuildInputs = [

View File

@ -20,14 +20,14 @@
let
pname = "qownnotes";
appname = "QOwnNotes";
version = "24.9.1";
version = "24.9.6";
in
stdenv.mkDerivation {
inherit pname version;
src = fetchurl {
url = "https://github.com/pbek/QOwnNotes/releases/download/v${version}/qownnotes-${version}.tar.xz";
hash = "sha256-W9w7FJ0EfwPLC9R6OnDz+yny4VSaRGdrPXvaReV9hco=";
hash = "sha256-r5X8/BObkDlhB0LkfMSdrYWaU8mwquQhSiPUDJjV1qM=";
};
nativeBuildInputs = [

View File

@ -176,7 +176,7 @@ recursiveUpdate lib (rec {
coqPackages.lib.overrideCoqDerivation
{
defaultVersion = "9999";
release."9999".sha256 = "1lq8x86vd3vqqh2yq6hvyagpnhfq5wmk5pg2z0xq7b7dbbbhyfkw";
release."9999".hash = "sha256-fDoP11rtrIM7+OLdMisv2EF7n/IbGuwFxHiPtg3qCNM=";
}
coqPackages.QuickChick;
```

View File

@ -3,16 +3,17 @@
fetchFromGitHub,
python3Packages,
}:
python3Packages.buildPythonApplication rec {
pname = "badkeys";
version = "0.0.11";
version = "0.0.12";
pyproject = true;
src = fetchFromGitHub {
owner = "badkeys";
repo = "badkeys";
rev = "refs/tags/v${version}";
hash = "sha256-VfkJeHEdvRc0Khf/C7ZUNpjd6t+hUULCTXXY80rs4Ko=";
hash = "sha256-LFoB/ZHIMRpN/eHg3x8HCxNbMKclf2SJSDPk33OIil8=";
};
build-system = with python3Packages; [
@ -38,8 +39,8 @@ python3Packages.buildPythonApplication rec {
description = "Tool to find common vulnerabilities in cryptographic public keys";
homepage = "https://badkeys.info/";
changelog = "https://github.com/badkeys/badkeys/releases/tag/${lib.removePrefix "refs/tags/" src.rev}";
mainProgram = "badkeys";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ getchoo ];
mainProgram = "badkeys";
};
}

View File

@ -12,18 +12,18 @@ let
registry = fetchFromGitHub {
owner = "bazelbuild";
repo = "bazel-central-registry";
rev = "1c729c2775715fd98f0f948a512eb173213250da";
hash = "sha256-1iaDDM8/v8KCOUjPgLUtZVta7rMzwlIK//cCoLUrb/s=";
rev = "40bc9ad53e5a59d596935839e7c072679e706266";
hash = "sha256-CL0YMQd1ck6/dlvJCLxt9jYyqDuk+iAWfdBOMj864u8=";
};
in buildBazelPackage rec {
pname = "bant";
version = "0.1.6";
version = "0.1.7";
src = fetchFromGitHub {
owner = "hzeller";
repo = "bant";
rev = "v${version}";
hash = "sha256-4h76ok2aN7WfD8OHIS0O2Dk924+hFXJXewKRM7XYjKw=";
hash = "sha256-QbxPosjlrpxbz6gQKUKccF2Gu/i5xvqh2gwfABYE8kE=";
};
bazelFlags = ["--registry" "file://${registry}"];
@ -34,8 +34,8 @@ in buildBazelPackage rec {
fetchAttrs = {
sha256 = {
aarch64-linux = "sha256-UI+Vz/gU6ki0yulcDbA1lkKJg0MZWYMIpfIHHmIjVLo=";
x86_64-linux = "sha256-9ryJUrmLkhuH6wRuHkAXIvOC+xGJ+jHL6vlAkRuXcUI=";
aarch64-linux = "sha256-09RL0tj6xsGEmuv11V81eAtqLc9nAaE8Il3d6ueS0UQ=";
x86_64-linux = "sha256-6mlaJ/kT14vKvlJjxqBK/lESjjxbcYxApi7+eiiI37M=";
}.${system} or (throw "No hash for system: ${system}");
};

View File

@ -6,12 +6,12 @@
}:
let
pname = "bazecor";
version = "1.4.4";
version = "1.4.5";
src = appimageTools.extract {
inherit pname version;
src = fetchurl {
url = "https://github.com/Dygmalab/Bazecor/releases/download/v${version}/Bazecor-${version}-x64.AppImage";
hash = "sha256-ep+3lqWdktyvbTKxfLcPiVq9/5f0xBHwKG1+BxDDBQA=";
hash = "sha256-cvzUjOmeTWB07vSe6taUyGDmTlN62fhsQw/OMgvIJ2M=";
};
# Workaround for https://github.com/Dygmalab/Bazecor/issues/370

View File

@ -6,7 +6,7 @@
, autoPatchelfHook
, libcxx
, libGL
, gcc7
, gcc
}:
stdenv.mkDerivation (finalAttrs: {
pname = "blackmagic-desktop-video";
@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
autoPatchelfHook
libcxx
libGL
gcc7.cc.lib
gcc.cc.lib
];
# yes, the below download function is an absolute mess.

View File

@ -25,20 +25,21 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "composefs";
version = "1.0.5";
version = "1.0.6";
src = fetchFromGitHub {
owner = "containers";
repo = "composefs";
rev = "v${finalAttrs.version}";
hash = "sha256-2h0wwtuhvFz5IExR/Fu0l+/nTAlDpMREVRjgrhbEghw=";
hash = "sha256-9YEY7oTjWwVT2KbzTOOc6sJIGEAkdLSKDf1noF1cYuA=";
};
strictDeps = true;
outputs = [ "out" "lib" "dev" ];
postPatch = lib.optionalString installExperimentalTools ''
sed -i "s/install : false/install : true/g" tools/meson.build
substituteInPlace tools/meson.build \
--replace-fail "install : false" "install : true"
'';
nativeBuildInputs = [ meson ninja go-md2man pkg-config ];

View File

@ -22,13 +22,13 @@ let
in
stdenvNoCC.mkDerivation rec {
pname = "gh-f";
version = "1.1.5";
version = "1.1.6";
src = fetchFromGitHub {
owner = "gennaro-tedesco";
repo = "gh-f";
rev = "v${version}";
hash = "sha256-ITl8T8Oe21m047ygFlxWVjzUYPG4rlcTjfSpsropYJw=";
hash = "sha256-F98CqsSRymL/8s8u7P2Pqt6+ipLoG9Z9Q8bB+IWZTpI=";
};
nativeBuildInputs = [

View File

@ -26,7 +26,7 @@ stdenv.mkDerivation {
./0009-Defer-setting-cursor-position-until-the-cursor-is-lo.patch
];
propagatedBuildInputs = [ libGL ];
propagatedBuildInputs = lib.optionals (!stdenv.hostPlatform.isWindows) [ libGL ];
nativeBuildInputs = [ cmake extra-cmake-modules ]
++ lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]

View File

@ -1,41 +1,26 @@
{ lib
, stdenv
, fetchurl
, fetchpatch
, autoreconfHook
, callPackage
, guile
, guile-commonmark
, guile-reader
, makeWrapper
, pkg-config
{
lib,
stdenv,
fetchurl,
fetchpatch,
autoreconfHook,
callPackage,
guile,
guile-commonmark,
guile-reader,
makeWrapper,
pkg-config,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "haunt";
version = "0.2.6";
version = "0.3.0";
src = fetchurl {
url = "https://files.dthompson.us/haunt/haunt-${finalAttrs.version}.tar.gz";
hash = "sha256-vPKLQ9hDJdimEAXwIBGgRRlefM8/77xFQoI+0J/lkNs=";
hash = "sha256-mLq+0GvlSgZsPryUQQqR63zEg2fpTVKBMdO6JxSZmSs=";
};
# Symbol not found: inotify_init
patches = [
(fetchpatch {
url = "https://git.dthompson.us/haunt.git/patch/?id=ab0b722b0719e3370a21359e4d511af9c4f14e60";
hash = "sha256-TPNJKGlbDkV9RpdN274qMLoN3HlwfH/yHpxlpqOPw58=";
})
(fetchpatch {
url = "https://git.dthompson.us/haunt.git/patch/?id=7d0b71f6a3f0e714da5a5c43e52408e27f44c383";
hash = "sha256-CW/h8CqsALKDuKRoN1bd/WEtFTvFj0VxtgmpatyrLm8=";
})
(fetchpatch {
url = "https://git.dthompson.us/haunt.git/patch/?id=1a91f3d0568fc095d8b0875c6553ef15b76efa4c";
hash = "sha256-+3wUlTuzbyGibAsCiYWKvzPqUrFs7VwdhnADjnPuWIY=";
})
];
nativeBuildInputs = [
autoreconfHook
makeWrapper

View File

@ -70,9 +70,9 @@
}
},
"node_modules/@azure/core-auth": {
"version": "1.7.2",
"resolved": "https://registry.npmjs.org/@azure/core-auth/-/core-auth-1.7.2.tgz",
"integrity": "sha512-Igm/S3fDYmnMq1uKS38Ae1/m37B3zigdlZw+kocwEhh5GjyKjPrXKO2J6rzpC1wAxrNil/jX9BJRqBshyjnF3g==",
"version": "1.8.0",
"resolved": "https://registry.npmjs.org/@azure/core-auth/-/core-auth-1.8.0.tgz",
"integrity": "sha512-YvFMowkXzLbXNM11yZtVLhUCmuG0ex7JKOH366ipjmHBhL3vpDcPAeWF+jf0X+jVXwFqo3UhsWUq4kH0ZPdu/g==",
"license": "MIT",
"dependencies": {
"@azure/abort-controller": "^2.0.0",
@ -688,45 +688,25 @@
}
},
"node_modules/@sinonjs/fake-timers": {
"version": "11.3.1",
"resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-11.3.1.tgz",
"integrity": "sha512-EVJO7nW5M/F5Tur0Rf2z/QoMo+1Ia963RiMtapiQrEWvY0iBUvADo8Beegwjpnle5BHkyHuoxSTW3jF43H1XRA==",
"version": "11.2.2",
"resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-11.2.2.tgz",
"integrity": "sha512-G2piCSxQ7oWOxwGSAyFHfPIsyeJGXYtc6mFbnFA+kRXkiEnTl8c/8jul2S329iFBnDI9HGoeWWAZvuvOkZccgw==",
"dev": true,
"license": "BSD-3-Clause",
"dependencies": {
"@sinonjs/commons": "^3.0.1"
"@sinonjs/commons": "^3.0.0"
}
},
"node_modules/@sinonjs/samsam": {
"version": "8.0.0",
"resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-8.0.0.tgz",
"integrity": "sha512-Bp8KUVlLp8ibJZrnvq2foVhP0IVX2CIprMJPK0vqGqgrDa0OHVKeZyBykqskkrdxV6yKBPmGasO8LVjAKR3Gew==",
"version": "8.0.2",
"resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-8.0.2.tgz",
"integrity": "sha512-v46t/fwnhejRSFTGqbpn9u+LQ9xJDse10gNnPgAcxgdoCDMXj/G2asWAC/8Qs+BAZDicX+MNZouXT1A7c83kVw==",
"dev": true,
"license": "BSD-3-Clause",
"dependencies": {
"@sinonjs/commons": "^2.0.0",
"@sinonjs/commons": "^3.0.1",
"lodash.get": "^4.4.2",
"type-detect": "^4.0.8"
}
},
"node_modules/@sinonjs/samsam/node_modules/@sinonjs/commons": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-2.0.0.tgz",
"integrity": "sha512-uLa0j859mMrg2slwQYdO/AkrOfmH+X6LTVmNTS9CqexuE2IvVORIkSpJLqePAbEnKJ77aMmCwr1NUZ57120Xcg==",
"dev": true,
"license": "BSD-3-Clause",
"dependencies": {
"type-detect": "4.0.8"
}
},
"node_modules/@sinonjs/samsam/node_modules/type-detect": {
"version": "4.0.8",
"resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
"integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
"dev": true,
"license": "MIT",
"engines": {
"node": ">=4"
"type-detect": "^4.1.0"
}
},
"node_modules/@sinonjs/text-encoding": {
@ -907,16 +887,16 @@
}
},
"node_modules/@types/mocha": {
"version": "10.0.7",
"resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-10.0.7.tgz",
"integrity": "sha512-GN8yJ1mNTcFcah/wKEFIJckJx9iJLoMSzWcfRRuxz/Jk+U6KQNnml+etbtxFK8lPjzOw3zp4Ha/kjSst9fsHYw==",
"version": "10.0.8",
"resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-10.0.8.tgz",
"integrity": "sha512-HfMcUmy9hTMJh66VNcmeC9iVErIZJli2bszuXc6julh5YGuRb/W5OnkHjwLNYdFlMis0sY3If5SEAp+PktdJjw==",
"dev": true,
"license": "MIT"
},
"node_modules/@types/node": {
"version": "20.16.2",
"resolved": "https://registry.npmjs.org/@types/node/-/node-20.16.2.tgz",
"integrity": "sha512-91s/n4qUPV/wg8eE9KHYW1kouTfDk2FPGjXbBMfRWP/2vg1rCXNQL1OCabwGs0XSdukuK+MwCDXE30QpSeMUhQ==",
"version": "20.16.5",
"resolved": "https://registry.npmjs.org/@types/node/-/node-20.16.5.tgz",
"integrity": "sha512-VwYCweNo3ERajwy0IUlqqcyZ8/A7Zwa9ZP3MnENWcB11AejO+tLy3pu850goUW2FC/IJMdZUfKpX/yxL1gymCA==",
"license": "MIT",
"dependencies": {
"undici-types": "~6.19.2"
@ -1241,9 +1221,9 @@
}
},
"node_modules/acorn-walk": {
"version": "8.3.3",
"resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.3.tgz",
"integrity": "sha512-MxXdReSRhGO7VlFe1bRG/oI7/mdLV9B9JJT0N8vZOhF7gFRR5l3M8W9G8JxmKV+JC5mGqJ0QvqfSOLsCPa4nUw==",
"version": "8.3.4",
"resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.4.tgz",
"integrity": "sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==",
"dev": true,
"license": "MIT",
"dependencies": {
@ -1324,9 +1304,9 @@
}
},
"node_modules/ansi-regex": {
"version": "6.0.1",
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
"integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
"version": "6.1.0",
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
"integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
"license": "MIT",
"engines": {
"node": ">=12"
@ -1600,9 +1580,9 @@
}
},
"node_modules/caniuse-lite": {
"version": "1.0.30001655",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001655.tgz",
"integrity": "sha512-jRGVy3iSGO5Uutn2owlb5gR6qsGngTw9ZTb4ali9f3glshcNmJ2noam4Mo9zia5P9Dk3jNNydy7vQjuE5dQmfg==",
"version": "1.0.30001660",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001660.tgz",
"integrity": "sha512-GacvNTTuATm26qC74pt+ad1fW15mlQ/zuTzzY1ZoIzECTP8HURDfF43kNxPgf7H1jmelCBQTTbBNxdSXOA7Bqg==",
"dev": true,
"funding": [
{
@ -1747,9 +1727,9 @@
}
},
"node_modules/cjs-module-lexer": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.4.0.tgz",
"integrity": "sha512-N1NGmowPlGBLsOZLPvm48StN04V4YvQRL0i6b7ctrVY3epjP/ct7hFLOItz6pDIvRjwpfPxi52a2UWV2ziir8g==",
"version": "1.4.1",
"resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.4.1.tgz",
"integrity": "sha512-cuSVIHi9/9E/+821Qjdvngor+xpnlwnuwIyZOaLmHBVdXL+gP+I6QQB9VkO7RI77YIcTV+S1W9AreJ5eN63JBA==",
"license": "MIT"
},
"node_modules/cliui": {
@ -1987,12 +1967,12 @@
}
},
"node_modules/debug": {
"version": "4.3.6",
"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz",
"integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==",
"version": "4.3.7",
"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
"integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
"license": "MIT",
"dependencies": {
"ms": "2.1.2"
"ms": "^2.1.3"
},
"engines": {
"node": ">=6.0"
@ -2197,9 +2177,9 @@
}
},
"node_modules/electron-to-chromium": {
"version": "1.5.13",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.13.tgz",
"integrity": "sha512-lbBcvtIJ4J6sS4tb5TLp1b4LyfCdMkwStzXPyAgVgTRAsep4bvrAGaBOP7ZJtQMNJpSQ9SqG4brWOroNaQtm7Q==",
"version": "1.5.24",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.24.tgz",
"integrity": "sha512-0x0wLCmpdKFCi9ulhvYZebgcPmHTkFVUfU2wzDykadkslKwT4oAmDTHEKLnlrDsMGZe4B+ksn8quZfZjYsBetA==",
"dev": true,
"license": "ISC"
},
@ -2245,9 +2225,9 @@
}
},
"node_modules/envinfo": {
"version": "7.13.0",
"resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.13.0.tgz",
"integrity": "sha512-cvcaMr7KqXVh4nyzGTVqTum+gAiL265x5jUWQIDLq//zOGbW+gSW/C+OWLleY/rs9Qole6AZLMXPbtIFQbqu+Q==",
"version": "7.14.0",
"resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.14.0.tgz",
"integrity": "sha512-CO40UI41xDQzhLB1hWyqUKgFhs250pNcGbyGKe1l/e4FSaI/+YE4IMG76GDt0In67WLPACIITC+sOi08x4wIvg==",
"dev": true,
"license": "MIT",
"bin": {
@ -3563,13 +3543,6 @@
"node": ">=10"
}
},
"node_modules/mocha/node_modules/ms": {
"version": "2.1.3",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
"dev": true,
"license": "MIT"
},
"node_modules/mocha/node_modules/serialize-javascript": {
"version": "6.0.0",
"resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz",
@ -3587,9 +3560,9 @@
"license": "MIT"
},
"node_modules/ms": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
"version": "2.1.3",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
"license": "MIT"
},
"node_modules/neo-async": {
@ -3609,17 +3582,27 @@
}
},
"node_modules/nise": {
"version": "6.0.0",
"resolved": "https://registry.npmjs.org/nise/-/nise-6.0.0.tgz",
"integrity": "sha512-K8ePqo9BFvN31HXwEtTNGzgrPpmvgciDsFz8aztFjt4LqKO/JeFD8tBOeuDiCMXrIl/m1YvfH8auSpxfaD09wg==",
"version": "6.1.1",
"resolved": "https://registry.npmjs.org/nise/-/nise-6.1.1.tgz",
"integrity": "sha512-aMSAzLVY7LyeM60gvBS423nBmIPP+Wy7St7hsb+8/fc1HmeoHJfLO8CKse4u3BtOZvQLJghYPI2i/1WZrEj5/g==",
"dev": true,
"license": "BSD-3-Clause",
"dependencies": {
"@sinonjs/commons": "^3.0.0",
"@sinonjs/fake-timers": "^11.2.2",
"@sinonjs/text-encoding": "^0.7.2",
"@sinonjs/commons": "^3.0.1",
"@sinonjs/fake-timers": "^13.0.1",
"@sinonjs/text-encoding": "^0.7.3",
"just-extend": "^6.2.0",
"path-to-regexp": "^6.2.1"
"path-to-regexp": "^8.1.0"
}
},
"node_modules/nise/node_modules/@sinonjs/fake-timers": {
"version": "13.0.2",
"resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-13.0.2.tgz",
"integrity": "sha512-4Bb+oqXZTSTZ1q27Izly9lv8B9dlV61CROxPiVtywwzv5SnytJqhvYe6FclHYuXml4cd1VHPo1zd5PmTeJozvA==",
"dev": true,
"license": "BSD-3-Clause",
"dependencies": {
"@sinonjs/commons": "^3.0.1"
}
},
"node_modules/node-releases": {
@ -3855,11 +3838,14 @@
}
},
"node_modules/path-to-regexp": {
"version": "6.2.2",
"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.2.2.tgz",
"integrity": "sha512-GQX3SSMokngb36+whdpRXE+3f9V8UzyAorlYvOGx87ufGHehNTn5lCxrKtLyZ4Yl/wEKnNnr98ZzOwwDZV5ogw==",
"version": "8.1.0",
"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.1.0.tgz",
"integrity": "sha512-Bqn3vc8CMHty6zuD+tG23s6v2kwxslHEhTj4eYaVKGIEB+YX/2wd0/rgXLFD9G9id9KCtbVy/3ZgmvZjpa0UdQ==",
"dev": true,
"license": "MIT"
"license": "MIT",
"engines": {
"node": ">=16"
}
},
"node_modules/path-type": {
"version": "5.0.0",
@ -3894,9 +3880,9 @@
}
},
"node_modules/picocolors": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz",
"integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==",
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz",
"integrity": "sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==",
"dev": true,
"license": "ISC"
},
@ -4476,14 +4462,14 @@
}
},
"node_modules/sinon": {
"version": "18.0.0",
"resolved": "https://registry.npmjs.org/sinon/-/sinon-18.0.0.tgz",
"integrity": "sha512-+dXDXzD1sBO6HlmZDd7mXZCR/y5ECiEiGCBSGuFD/kZ0bDTofPYc6JaeGmPSF+1j1MejGUWkORbYOLDyvqCWpA==",
"version": "18.0.1",
"resolved": "https://registry.npmjs.org/sinon/-/sinon-18.0.1.tgz",
"integrity": "sha512-a2N2TDY1uGviajJ6r4D1CyRAkzE9NNVlYOV1wX5xQDuAk0ONgzgRl0EjCQuRCPxOwp13ghsMwt9Gdldujs39qw==",
"dev": true,
"license": "BSD-3-Clause",
"dependencies": {
"@sinonjs/commons": "^3.0.1",
"@sinonjs/fake-timers": "^11.2.2",
"@sinonjs/fake-timers": "11.2.2",
"@sinonjs/samsam": "^8.0.0",
"diff": "^5.2.0",
"nise": "^6.0.0",
@ -4761,9 +4747,9 @@
}
},
"node_modules/terser": {
"version": "5.31.6",
"resolved": "https://registry.npmjs.org/terser/-/terser-5.31.6.tgz",
"integrity": "sha512-PQ4DAriWzKj+qgehQ7LK5bQqCFNMmlhjR2PFFLuqGCpuCAauxemVBWwWOxo3UIwWQx8+Pr61Df++r76wDmkQBg==",
"version": "5.32.0",
"resolved": "https://registry.npmjs.org/terser/-/terser-5.32.0.tgz",
"integrity": "sha512-v3Gtw3IzpBJ0ugkxEX8U0W6+TnPKRRCWGh1jC/iM/e3Ki5+qvO1L1EAZ56bZasc64aXHwRHNIQEzm6//i5cemQ==",
"dev": true,
"license": "BSD-2-Clause",
"dependencies": {

View File

@ -5,7 +5,7 @@
nix-update-script,
}:
let
version = "1.12.5";
version = "1.12.6";
in
buildNpmPackage {
pname = "intelephense";
@ -13,14 +13,14 @@ buildNpmPackage {
src = fetchurl {
url = "https://registry.npmjs.org/intelephense/-/intelephense-${version}.tgz";
hash = "sha256-S2wlzEDSKu/7NxnFMAj25meXzW37fGbH1ztCbWDRAqc=";
hash = "sha256-p2x5Ayipoxk77x0v+zRhg86dbRHuBBk1Iegk/FaZrU4=";
};
postPatch = ''
cp ${./package-lock.json} package-lock.json
'';
npmDepsHash = "sha256-HpJYDPPX5elvd0SMCJuTu5j4v1caO25UZqywB2huUAA=";
npmDepsHash = "sha256-C60qxPuaiJZ8uQDfDwY+KJUHhXMioPrHnDNJ0bH7N9o=";
dontNpmBuild = true;

View File

@ -10,7 +10,7 @@
, nix-output-monitor
}:
let
version = "3.5.25";
version = "3.5.26";
runtimeDeps = [ nvd nix-output-monitor ];
in
rustPlatform.buildRustPackage {
@ -21,7 +21,7 @@ rustPlatform.buildRustPackage {
owner = "viperML";
repo = "nh";
rev = "refs/tags/v${version}";
hash = "sha256-dCfl8q5dg8euqD6NzsN4CLyY6KxmglCU9yJtSKYk+KU=";
hash = "sha256-p38Uini6lChBCF0mZndHXTAy7ZH/OQLY696BFCHg92g=";
};
strictDeps = true;
@ -47,7 +47,7 @@ rustPlatform.buildRustPackage {
--prefix PATH : ${lib.makeBinPath runtimeDeps}
'';
cargoHash = "sha256-vCJ8Y1wXrgd4tft+VVguDI9RO+Wb6QRqIeQL3qbrRdI=";
cargoHash = "sha256-ejjgtjDNB7XBKi83R48xG3HLhTmm26Sdqdgh0xRVtNA=";
passthru.updateScript = nix-update-script { };

View File

@ -10,11 +10,11 @@
}:
stdenv.mkDerivation rec {
pname = "nzbhydra2";
version = "7.5.0";
version = "7.6.0";
src = fetchzip {
url = "https://github.com/theotherp/nzbhydra2/releases/download/v${version}/nzbhydra2-${version}-generic.zip";
hash = "sha256-jnClKsWSdRWCxNFO9RSnjdoDjOmtv9CrOL9KyaZ8PTc=";
hash = "sha256-EMp7bR3VCFWgg32ddUzAIEVINIeGXq8qBiIp3G/YI0I=";
stripRoot = false;
};

View File

@ -0,0 +1,40 @@
{
fetchFromGitHub,
lib,
stdenv,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "plasma-applet-commandoutput";
version = "13";
src = fetchFromGitHub {
owner = "Zren";
repo = "plasma-applet-commandoutput";
rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-Tjnm26EYKXtBM9JBHKI73AMvOW/rQ3qOw2JDYey7EfQ=";
};
dontConfigure = true;
dontBuild = true;
installPhase = ''
runHook preInstall
mkdir -p $out/share/plasma/plasmoids
cp -r package $out/share/plasma/plasmoids/com.github.zren.commandoutput
runHook postInstall
'';
meta = {
changelog = "https://github.com/Zren/plasma-applet-commandoutput/blob/${finalAttrs.src.rev}/Changelog.md";
description = "Run a command periodically and render its output";
homepage = "https://github.com/Zren/plasma-applet-commandoutput";
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [
matthiasbeyer
oliver-ni
];
};
})

View File

@ -132,7 +132,8 @@ stdenv.mkDerivation (finalAttrs: {
};
meta = with lib; {
homepage = "https://gitlab.freedesktop.org/hadess/power-profiles-daemon";
changelog = "https://gitlab.freedesktop.org/upower/power-profiles-daemon/-/releases/${finalAttrs.version}";
homepage = "https://gitlab.freedesktop.org/upower/power-profiles-daemon";
description = "Makes user-selected power profiles handling available over D-Bus";
mainProgram = "powerprofilesctl";
platforms = platforms.linux;

View File

@ -8,16 +8,16 @@
}:
rustPlatform.buildRustPackage rec {
pname = "wayland-pipewire-idle-inhibit";
version = "0.5.1";
version = "0.5.2";
src = fetchFromGitHub {
owner = "rafaelrc7";
repo = "wayland-pipewire-idle-inhibit";
rev = "v${version}";
hash = "sha256-2akYbnQnJ0wb51S3bwrm3/EiZydxbwkfuSfsiTvtNz8=";
hash = "sha256-8oVTexYGQWyaAVJedrp4kIQ7VjBR47l65eByZr7oghg=";
};
cargoHash = "sha256-C4cispJN2OQRBQiW+H36B8ETNn1oukgdELRVk7V7BQU=";
cargoHash = "sha256-6MzV2JOVFezD9fVDbzZ6Zm9RWOexh5LPk6AWOleOc2Q=";
nativeBuildInputs = [
pkg-config

View File

@ -1,13 +1,13 @@
{
lib,
buildGoModule,
buildNpmPackage,
fetchFromGitHub,
nix-update-script,
nixosTests,
...
}:
buildGoModule rec {
let
pname = "workout-tracker";
version = "1.18.1";
@ -18,8 +18,31 @@ buildGoModule rec {
hash = "sha256-Sn6SOHrsp1ZgsPntc2+cmlAEPVBUrYv1vKLKAQvT9m4=";
};
assets = buildNpmPackage {
pname = "${pname}-assets";
inherit version src;
npmDepsHash = "sha256-jHpvCMgjGvaAOfbslaIKfIRiPafScpn3WLnYamm+lbs=";
dontNpmBuild = true;
postPatch = ''
rm Makefile
'';
installPhase = ''
runHook preInstall
cp -r . "$out"
runHook postInstall
'';
};
in
buildGoModule rec {
inherit pname version src;
vendorHash = null;
postPatch = ''
ln -s ${assets}/node_modules ./node_modules
make build-dist
'';
passthru.updateScript = nix-update-script { };
passthru.tests = {

View File

@ -6,6 +6,13 @@ sha256 = "1z35j4py67c3x2f87mzvczpbbcskd80d5m7a7080gfxzrmwrn2c9"
synopsis = "Markdown to Gemini text"
version = "1.33"
[9p]
dependencies = ["iset", "srfi-1", "srfi-13", "srfi-18", "srfi-69"]
license = "bsd"
sha256 = "10lzil2d81lrqhp6kim5dwfipap2pifxfkb72p1pf8qbgmgwc00x"
synopsis = "9p networked filesystem protocol implementation. Includes high-level client and server code library"
version = "0.9"
[F-operator]
dependencies = ["miscmacros", "datatype", "box"]
license = "bsd"
@ -289,9 +296,9 @@ version = "1.37"
[bitwise-utils]
dependencies = []
license = "public-domain"
sha256 = "1p433kx2q1zam5a2isgnxiywgkcb77bmbqlajpr7rvm5i739h8g7"
sha256 = "1s8vxp2v2b7dxg1hwy5lzaf4bg072xd5fpl487mg34yy7l7krfla"
synopsis = "Bitwise utilities"
version = "1.3.1"
version = "1.4.1"
[blas]
dependencies = ["bind", "compile-file", "srfi-13"]
@ -611,16 +618,16 @@ version = "1.2"
[coops-utils]
dependencies = ["srfi-1", "srfi-13", "check-errors", "coops"]
license = "bsd"
sha256 = "1ywxc7r1l5a930rfp0fv99dcfg2gbvg93rp4jih4rnlpwys6gpv4"
sha256 = "0jvikvzxy4mz8x9pg0m89pidjmfjxm2g66lz3j84ip4ip8s28nwf"
synopsis = "coops utilities"
version = "2.2.3"
version = "2.2.4"
[coops]
dependencies = ["matchable", "miscmacros", "record-variants", "srfi-1"]
license = "bsd"
sha256 = "183pp1g5m06ss94ba1rq2rs4hqj92v6qz7ik3kzvl3b2aq77jk3z"
sha256 = "1gzrjb4dj66c9nca6yychbamcslgip0qy2hzfk2v0a41251kl1q5"
synopsis = "A featureful object system"
version = "1.3"
version = "1.4"
[crc]
dependencies = []
@ -814,9 +821,9 @@ version = "1.0"
[edward]
dependencies = ["r7rs", "srfi-1", "srfi-14", "srfi-37", "matchable", "posix-regex"]
license = "gplv3"
sha256 = "0gfvjgg6c6hl2xmh63067xkh0sd2vmczwisirgglcm2inz4hjll3"
sha256 = "02vqx4gbj26424hay5n7mma423s1nsmz77cy7qfh2baaap0iz8q2"
synopsis = "An extensible implementation of the ed text editor as defined in POSIX.1-2008"
version = "1.0.1"
version = "1.1.0"
[egg-tarballs]
dependencies = ["simple-sha1", "srfi-1", "srfi-13"]
@ -1248,9 +1255,9 @@ version = "0.0.1"
[henrietta-cache]
dependencies = ["http-client", "matchable", "srfi-1"]
license = "bsd"
sha256 = "0lkjrvldxps7ld4fv2c8p1vaw1nb4lbk85agq529j0ix7nzwfwxm"
sha256 = "1ac3d4bb28cwzbamcz4ak62w4xbh7j15q0445b6c4z06cbfz0bj3"
synopsis = "Fetch and cache extensions from various sources for Henrietta to consume"
version = "1.6.1"
version = "1.7"
[henrietta]
dependencies = ["regex", "srfi-1"]
@ -1409,9 +1416,9 @@ version = "0.4"
[ipfs]
dependencies = ["http-client", "intarweb", "medea", "srfi-1", "srfi-13", "srfi-189", "srfi-197", "uri-common"]
license = "unlicense"
sha256 = "1ghsqdnw73xz9pbl6d7j38qgs066wsy1y6q9l0ardbqkmkibwyr8"
sha256 = "1fipsadibalrakzgai8mhxhizsy5a9jdg82x7x4r84gzjr30s327"
synopsis = "IPFS HTTP API for Scheme"
version = "0.0.15"
version = "0.0.17"
[irc]
dependencies = ["matchable", "regex", "srfi-1"]
@ -1514,9 +1521,9 @@ version = "0.3"
[lay]
dependencies = []
license = "bsd"
sha256 = "1z7n51p6yzn9bd4l7jxh3mrq45a6h8mi95s2v2d9xgn3m0dmbhqi"
sha256 = "0ak7bgs79xz5yiywv159s471zqmhawwfipfn9ccll8nw1anp8gdw"
synopsis = "Lay eggs efficiently"
version = "0.2.2"
version = "0.2.3"
[lazy-ffi]
dependencies = ["bind", "srfi-1", "srfi-69"]
@ -1549,9 +1556,9 @@ version = "1.2"
[levenshtein]
dependencies = ["srfi-1", "srfi-13", "srfi-63", "srfi-69", "vector-lib", "utf8", "miscmacros", "record-variants", "check-errors"]
license = "bsd"
sha256 = "1q09kml6igd010j630m52rg7vayfsab176k3vjcsjn7ccf3i7a31"
sha256 = "1vgxdnas0sw47f8c68ki8fi7j6m9q5x96qnddwslwijjdhg7gdrm"
synopsis = "Levenshtein edit distance"
version = "2.4.1"
version = "2.4.3"
[lexgen]
dependencies = ["srfi-1", "utf8", "srfi-127"]
@ -1619,9 +1626,9 @@ version = "1.0.6"
[locale]
dependencies = ["srfi-1", "utf8", "check-errors"]
license = "bsd"
sha256 = "1mqdr1bw5w6nnrg5dxzc4m5qnbrvvkk9v8nm3a6y0qmpscaim9z5"
sha256 = "1f6wkaf89b74wxlhdxd4clmgavirvw3ld2igwqwi3rh1w95ln7x4"
synopsis = "Provides locale operations"
version = "0.9.2"
version = "0.9.4"
[locals]
dependencies = []
@ -1722,11 +1729,11 @@ synopsis = "Hygienic MATCH replacement"
version = "1.2"
[math-utils]
dependencies = []
dependencies = ["memoize", "miscmacros"]
license = "public-domain"
sha256 = "1vc8xrah2yngfbwvah1948h156dp1lw75nrapjcmvybc2315fn93"
sha256 = "1sl46zqv9al83blyzrl39k22arxq57i7j0qayri3qq9xwpgdhrf2"
synopsis = "Miscellaneous math utilities"
version = "1.1.0"
version = "1.5.0"
[math]
dependencies = ["srfi-1", "r6rs-bytevectors", "miscmacros", "srfi-133", "srfi-42"]
@ -1745,9 +1752,9 @@ version = "4.7.0"
[matrico]
dependencies = []
license = "zlib-acknowledgement"
sha256 = "0ng09xbk8229nhq4s8f8rxgrgigf81qr685mggvk2lm5p7kckpjq"
sha256 = "11q9599lqs3rb0af6sxj2lvbm06a39igpnpdp1drl8zswdw41kyk"
synopsis = "A flonum matrix module for CHICKEN Scheme."
version = "0.5rel"
version = "0.6rel"
[md5]
dependencies = ["message-digest-primitive"]
@ -1983,9 +1990,9 @@ version = "2.0"
[nrepl]
dependencies = ["srfi-18"]
license = "bsd"
sha256 = "0d4pl1j1wayqsdryc5v8la5v5p9nifwva86z48vlss3s388na208"
sha256 = "12iad99bpv18k7jn8shc7mga2h218g5hll3arhfcvmka4grndvzs"
synopsis = "Simple networked REPL over TCP"
version = "5.0.8"
version = "5.1.0"
[number-limits]
dependencies = []
@ -2165,9 +2172,9 @@ version = "2.1.1"
[postgresql]
dependencies = ["sql-null", "srfi-1", "srfi-13", "srfi-69"]
license = "bsd"
sha256 = "06sqn5gz5n2zfdk5z2c20mz4r6w9mslxvlanvmq1wdzr5qnvkh9s"
sha256 = "0hhbq2bc0jzya430n67d26y86q9y11nci3shpjcwlycvq9k1vx8j"
synopsis = "Bindings for PostgreSQL's C-api"
version = "4.1.4"
version = "4.1.5"
[poule]
dependencies = ["datatype", "mailbox", "matchable", "srfi-1", "srfi-18", "typed-records"]
@ -2211,6 +2218,13 @@ sha256 = "0sid5fcw9pvf8n1zq5i757pzdr4hgx5w55qgrabsxpq5pgxj6gbs"
synopsis = "Procedure Decoration API"
version = "3.0.0"
[prometheus]
dependencies = ["srfi-1"]
license = "bsd"
sha256 = "0a7vj4wymc3cx5l4z9dagqsg1sy88cbp67fhbnvghi5b1lqz6ypz"
synopsis = "The Prometheus Object System."
version = "1.0.0"
[protobj]
dependencies = []
license = "lgpl-2.1"
@ -2228,9 +2242,9 @@ version = "1.2.3"
[pseudo-meta-egg-info]
dependencies = ["spiffy", "uri-common", "svn-client"]
license = "public-domain"
sha256 = "0dmhxm851vbzfcf14sqqxqpmigxvi0195ih9zb25nbxnsdcmy684"
sha256 = "0fygg85s823y5sblqpbqg4flf7cyynar49p1a37rlig3d7biag5b"
synopsis = "Provide automatically generated release-info and a pseudo-\"meta\"-file for eggs in svn"
version = "1.1"
version = "1.2"
[pseudolists]
dependencies = []
@ -2529,9 +2543,9 @@ version = "1.8"
[scm2wiki]
dependencies = ["srfi-1", "srfi-13", "srfi-14", "args", "comparse"]
license = "mit"
sha256 = "0f8zwxkskzlillnbyngzgaqqgxviimn52rscj6vxx9hgl2yw3mkk"
sha256 = "03mc88pri6c3h5r5z3xz771mdarc0a6iv4x691jlq6chs983x13v"
synopsis = "An auto-documentation tool for CHICKEN Scheme."
version = "0.3.2"
version = "0.3.3"
[scmfmt]
dependencies = []
@ -2760,9 +2774,9 @@ version = "1.1.4"
[slib-charplot]
dependencies = ["slib-arraymap", "srfi-63", "slib-compat"]
license = "artistic"
sha256 = "1ijcvs9y2vxmxg5834s4mprkinxhky0xdl3yksysmg9h9p82il2z"
sha256 = "04hyggnbxdjk0vq0x59gi98ybvkq2y3c8llb8zh9bzz045yj7n90"
synopsis = "The SLIB character plotting library"
version = "1.2.2"
version = "1.2.3"
[slib-compat]
dependencies = ["srfi-1"]
@ -2823,9 +2837,9 @@ version = "0.3.3"
[sparse-vectors]
dependencies = ["srfi-1", "record-variants"]
license = "bsd"
sha256 = "0nmk6c9mhls38lyp0d8a9f3xh94jbl2dqbmqr9pab23pnx4hha1j"
sha256 = "1vvwkjkw3drlmy0pmihg2l5c3s8wbvp0d60934idgyb7vvbdy0rz"
synopsis = "Arbitrarily large vectors"
version = "1.1.0"
version = "1.1.1"
[spiffy-cgi-handlers]
dependencies = ["spiffy", "intarweb", "uri-common", "socket", "records", "srfi-1", "srfi-18", "srfi-13", "miscmacros"]
@ -2872,9 +2886,9 @@ version = "1.0"
[spiffy]
dependencies = ["intarweb", "uri-common", "uri-generic", "sendfile", "srfi-1", "srfi-13", "srfi-14", "srfi-18"]
license = "bsd"
sha256 = "1nfxygrscvldmayr5sm8vqqvzv2wk63yh7pksp7v5gkffd0yhnzs"
sha256 = "0pb03w2xjiwg2vn5v27mph53vkliq33acs0zhll9sj44hg6c4rvl"
synopsis = "A small but powerful web server"
version = "6.3"
version = "6.4"
[spock]
dependencies = ["jsmin", "matchable", "make"]
@ -3164,11 +3178,11 @@ synopsis = "SRFI-18 thread library"
version = "0.1.7"
[srfi-180]
dependencies = ["r7rs", "srfi-60", "srfi-145", "srfi-121"]
license = "mit"
sha256 = "0agky55bn26967nqcaa3n2a3rsr79brybizcivh34qna15gahq39"
synopsis = "This library describes a JavaScript Object Notation (JSON) parser and printer. It supports JSON that may be bigger than memory."
version = "1.0.0"
dependencies = ["srfi-34", "srfi-35", "srfi-158"]
license = "bsd"
sha256 = "1sxyhd4kzhlg0p3a1fzrxkqn7amhd8vb89ql4ykssrknmc9svmvd"
synopsis = "A JSON parser and printer that supports JSON bigger than memory."
version = "1.5.2"
[srfi-189]
dependencies = ["srfi-1", "typed-records"]
@ -3180,9 +3194,9 @@ version = "1.0.3"
[srfi-19]
dependencies = ["srfi-1", "utf8", "srfi-18", "srfi-29", "miscmacros", "locale", "record-variants", "check-errors"]
license = "bsd"
sha256 = "06lr89dgaslq218434al3nd18zdnp6rm4c6gr96pcglhjarcyv1n"
sha256 = "10bnm3gsc3rdafw239pwr6f8c95ma4a11k3cjjjscr8gvxl1kywp"
synopsis = "Time Data Types and Procedures"
version = "4.9.8"
version = "4.9.9"
[srfi-193]
dependencies = []
@ -3226,6 +3240,13 @@ sha256 = "04fghjk0rfcz0fp71dvwvlxmxshrbmrs85g4l5cx8sp74y047qlv"
synopsis = "SRFI 209: Enums and enum sets"
version = "1.3.1"
[srfi-214]
dependencies = ["r7rs", "srfi-1", "srfi-145"]
license = "mit"
sha256 = "0mfh9v10r51y3jcqm3fk4d9cwjjpyw31vyi8s229cxkikfq4x5rp"
synopsis = "SRFI 241: Flexvectors"
version = "1.0.1"
[srfi-216]
dependencies = ["srfi-18"]
license = "mit"
@ -3691,9 +3712,9 @@ version = "1.0.4"
[test-utils]
dependencies = ["test"]
license = "bsd"
sha256 = "0c4zj3i4g1iq38ifdgzhrl5lz0v97qzphsyg1d2a6ps6zr7jwgbf"
sha256 = "0nd309zshnwsackk7vzxj9496g58j2ch65h0lghsjpx2ns9l2s14"
synopsis = "Test Utilities (for test egg)"
version = "1.0.5"
version = "1.1.0"
[test]
dependencies = []

View File

@ -216,7 +216,6 @@ in
iup = broken;
kiwi = broken;
lmdb-ht = broken;
lsp-server = broken;
mpi = broken;
pyffi = broken;
qt-light = broken;
@ -225,7 +224,6 @@ in
svn-client = broken;
system = broken;
tokyocabinet = broken;
transducers = broken;
webview = broken;
# mark broken darwin

View File

@ -18,12 +18,12 @@ let
in
stdenv.mkDerivation rec {
pname = "circt";
version = "1.84.0";
version = "1.86.0";
src = fetchFromGitHub {
owner = "llvm";
repo = "circt";
rev = "firtool-${version}";
hash = "sha256-9GOn0wnFQ9JidLf5qpz2xG0lf+cCqKMvZnAy4JDCFu4=";
hash = "sha256-xV7vu3zdWBXgnCCUN9ge1GZemo0prmpQrZ1np86i3jI=";
fetchSubmodules = true;
};

View File

@ -14,6 +14,9 @@
vulkan-headers,
vulkan-loader,
# NOTE: Not coming from vcpkg
IMGUI_LINK_GLVND ? !stdenv.hostPlatform.isWindows && (IMGUI_BUILD_OPENGL2_BINDING || IMGUI_BUILD_OPENGL3_BINDING),
# The intent is to mirror vcpkg's flags[^1],
# but we only actually support Linux and glfw3 until someone contributes the rest
# [^1]: https://github.com/microsoft/vcpkg/blob/095ee06e7f60dceef7d713e3f8b1c2eb10d650d7/ports/imgui/CMakeLists.txt#L33-L108
@ -84,7 +87,7 @@ stdenv.mkDerivation rec {
];
propagatedBuildInputs =
lib.optionals (IMGUI_BUILD_OPENGL2_BINDING || IMGUI_BUILD_OPENGL3_BINDING) [ libGL ]
lib.optionals IMGUI_LINK_GLVND [ libGL ]
++ lib.optionals IMGUI_BUILD_GLFW_BINDING [ glfw ]
++ lib.optionals IMGUI_BUILD_SDL2_BINDING [ SDL2 ]
++ lib.optionals IMGUI_BUILD_VULKAN_BINDING [

View File

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "apycula";
version = "0.13";
version = "0.14";
pyproject = true;
disabled = pythonOlder "3.8";
@ -17,7 +17,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit version;
pname = "Apycula";
hash = "sha256-MXzF/nqJj+lsNjl3YLFHTqRLBVxBaKOY+GVboT6Pc4g=";
hash = "sha256-sunqCWfXz91nqbJXGeivo3DoQOVgcA8grO5j3atrLbo=";
};
build-system = [ setuptools-scm ];

View File

@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "awscrt";
version = "0.21.4";
version = "0.21.5";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-pzvkFOB96OFLzdNmoB2uuIiTzyYOP10Lzjs0HF+ElGY=";
hash = "sha256-fsKmevMPvzhklN8Au9+Zb3AkAA32sBqxYAFK/vK5EAU=";
};
buildInputs = lib.optionals stdenv.isDarwin [

View File

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "catppuccin";
version = "2.3.1";
version = "2.3.4";
pyproject = true;
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "catppuccin";
repo = "python";
rev = "refs/tags/v${version}";
hash = "sha256-MIxhl9D6nur26ZrbcXAwH8xO9YZlBvVKlB82qKX3Tx0=";
hash = "sha256-0+sbf2m0vJCf6EOl6DMqgtL35RJh+rehi/p0ylTPJK8=";
};
build-system = [

View File

@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "dbt-adapters";
version = "1.6.0";
version = "1.6.1";
pyproject = true;
src = fetchFromGitHub {
owner = "dbt-labs";
repo = "dbt-adapters";
rev = "refs/tags/v${version}";
hash = "sha256-P8AWh11nrP6EtBZrvxu9BoCpP+a8oljzRxbJXkVB2B4=";
hash = "sha256-i5sGgkFrW/37PH5XnH2bf/bTNgCZwEgNZT9IMbOJwLQ=";
};
build-system = [ hatchling ];

View File

@ -29,14 +29,14 @@
buildPythonPackage rec {
pname = "fiona";
version = "1.10.0";
version = "1.10.1";
pyproject = true;
src = fetchFromGitHub {
owner = "Toblerity";
repo = "Fiona";
rev = "refs/tags/${version}";
hash = "sha256-0Jiyq9x9YLDN1a1LBlCK2ac6kLZ5X2rOPusUQH5OPrQ=";
hash = "sha256-5NN6PBh+6HS9OCc9eC2TcBvkcwtI4DV8qXnz4tlaMXc=";
};
build-system = [

View File

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "holidays";
version = "0.56";
version = "0.57";
pyproject = true;
disabled = pythonOlder "3.8";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "vacanza";
repo = "python-holidays";
rev = "refs/tags/v${version}";
hash = "sha256-oNqgkDIMWfu48vVt1382IWdwHhhvpoR2U60l9jSF6Qo=";
hash = "sha256-/aijcDD0gzg217NuD7A9qdgArek1fHWjb2SfA2H4gww=";
};
build-system = [

View File

@ -31,7 +31,7 @@
buildPythonPackage rec {
pname = "labelbox";
version = "3.78.0";
version = "4.0.0";
pyproject = true;
disabled = pythonOlder "3.8";
@ -40,7 +40,7 @@ buildPythonPackage rec {
owner = "Labelbox";
repo = "labelbox-python";
rev = "refs/tags/v.${version}";
hash = "sha256-P/yhN1DdUWuQ4UtqRtvJxdjgTAh2IAs5oS0zxFLunuU=";
hash = "sha256-jIbSKT/jRWVyN2LH6Ih0VFc5QKICR7cYONzGpZ9bJvM=";
};
sourceRoot = "${src.name}/libs/labelbox";
@ -99,7 +99,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Platform API for LabelBox";
homepage = "https://github.com/Labelbox/labelbox-python";
changelog = "https://github.com/Labelbox/labelbox-python/blob/v.${version}/CHANGELOG.md";
changelog = "https://github.com/Labelbox/labelbox-python/releases/tag/v.${version}";
license = licenses.asl20;
maintainers = with maintainers; [ rakesh4g ];
};

View File

@ -33,7 +33,7 @@
buildPythonPackage rec {
pname = "meshtastic";
version = "2.4.3";
version = "2.5.0";
pyproject = true;
disabled = pythonOlder "3.7";
@ -42,7 +42,7 @@ buildPythonPackage rec {
owner = "meshtastic";
repo = "Meshtastic-python";
rev = "refs/tags/${version}";
hash = "sha256-cI3ETBz/3Megd3T/JVFdsN7Ap7SPj89IEIaA316INTk=";
hash = "sha256-f2nMbX2qCOwI5N6VunVSFncrEVpYMpc5o7hEZ0sg7rU=";
};
pythonRelaxDeps = [

View File

@ -66,8 +66,8 @@ rec {
"sha256-Pm/KyqcUUAQBZjQKaVhuL/9c+qfkgfeD51esgE+EgQw=";
mypy-boto3-amplify =
buildMypyBoto3Package "amplify" "1.35.0"
"sha256-ygrF3yPf6IEBlcM0fUth7vVRpJXiduohl3gZtqyarZU=";
buildMypyBoto3Package "amplify" "1.35.19"
"sha256-EP342ZP67DkGOrA2hLiv0iE1mL6SpaUOY8BHCdhaqRE=";
mypy-boto3-amplifybackend =
buildMypyBoto3Package "amplifybackend" "1.35.0"
@ -634,8 +634,8 @@ rec {
"sha256-BWNccaLrGmm5liiAOHCeFqSlkDk8wnj+/ipExaVZVis=";
mypy-boto3-iot =
buildMypyBoto3Package "iot" "1.35.0"
"sha256-O/8dNH6kDNMfjmnXy9/8TBGvFvXQ4V+kWhQMTAT4yug=";
buildMypyBoto3Package "iot" "1.35.20"
"sha256-3D1VjhsSVOedLhn7W6Huch4aowjlJgCuotUyln71n6k=";
mypy-boto3-iot-data =
buildMypyBoto3Package "iot-data" "1.35.0"
@ -698,16 +698,16 @@ rec {
"sha256-e4a8Na1spmmaUVAiAWPvn7DqzYHzEL4EatCewrRxJKE=";
mypy-boto3-ivs =
buildMypyBoto3Package "ivs" "1.35.0"
"sha256-MkWcD/B95hvrb7w8CkKNtL5mmZYcV+ROCBvTkRDthbk=";
buildMypyBoto3Package "ivs" "1.35.19"
"sha256-CXQnPKSn8oMyj2V2+iTjcqPEGykM2mOrRDVTkYEX/Jo=";
mypy-boto3-ivs-realtime =
buildMypyBoto3Package "ivs-realtime" "1.35.15"
"sha256-pO8W60U+c56/1F7LECM4AcOMIW7sHifSd9Ov+HJ4TpQ=";
mypy-boto3-ivschat =
buildMypyBoto3Package "ivschat" "1.35.0"
"sha256-6DhfxgNqJftRnqipRT3v6RLDvz7lA8TqO/1gMMs702U=";
buildMypyBoto3Package "ivschat" "1.35.19"
"sha256-Eb2polqqaboA93F86ZpJ9IzZRY5FRRceq+wLp/V2/2U=";
mypy-boto3-kafka =
buildMypyBoto3Package "kafka" "1.35.15"
@ -866,8 +866,8 @@ rec {
"sha256-QyyTcFluG5S6CQFwxahz/a9zj40dqhiqyD+OuUn79/0=";
mypy-boto3-medialive =
buildMypyBoto3Package "medialive" "1.35.17"
"sha256-BtcPmfu1V+dy+Y7ObTJuw+fJqT45y6ybepsnT+JEbtE=";
buildMypyBoto3Package "medialive" "1.35.20"
"sha256-/tGt9kyF1LtOzejqC9F4qStNZa67tXeUf9yxc6UXs6M=";
mypy-boto3-mediapackage =
buildMypyBoto3Package "mediapackage" "1.35.0"
@ -986,8 +986,8 @@ rec {
"sha256-qyUZN9Gz8Q6TBDg1LW+M58TLwDlmqJ9aCr4021LbSL0=";
mypy-boto3-organizations =
buildMypyBoto3Package "organizations" "1.35.5"
"sha256-5v80ZSyLS+VPunW70xtLJGR6VAJos6fBdAcbxWJw+hE=";
buildMypyBoto3Package "organizations" "1.35.20"
"sha256-SqZDiV8VrLmcdW+cO7LjCFipeJtPlL04uXx58UDgsg0=";
mypy-boto3-osis =
buildMypyBoto3Package "osis" "1.35.0"
@ -1086,8 +1086,8 @@ rec {
"sha256-85yUjKQ8oiECUYHhmmYrDssyFSQb6itfIRY2iuwCZdo=";
mypy-boto3-rds =
buildMypyBoto3Package "rds" "1.35.18"
"sha256-zRuyKAf5mfKDKHZPNiYNzbBaU+cVBTJKz+pVC6LSnD8=";
buildMypyBoto3Package "rds" "1.35.20"
"sha256-sjAaaFf5Lvb2EXbjxBNoBskNLGRIXxddaVZ2zgkImbU=";
mypy-boto3-rds-data =
buildMypyBoto3Package "rds-data" "1.35.0"

View File

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "py-serializable";
version = "1.1.0";
version = "1.1.1";
pyproject = true;
disabled = pythonOlder "3.8";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "madpah";
repo = "serializable";
rev = "refs/tags/v${version}";
hash = "sha256-8rGsFQzZbWJydzGhdobeN/L2LH2BEpC7O9D/h8zoXcM=";
hash = "sha256-8ciRzanrcb7DMAcWzIxRkgeCRGw+Ji8Epnw67cylGeQ=";
};
build-system = [ poetry-core ];

View File

@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "types-lxml";
version = "2024.08.07";
version = "2024.09.16";
pyproject = true;
disabled = pythonOlder "3.8";
@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "abelcheung";
repo = "types-lxml";
rev = "refs/tags/${version}";
hash = "sha256-odllaOqqVGI/k84cro5YXkhDlUx+BRSe5WWwYWXhCY0=";
hash = "sha256-LQqs9wg6kgubY4SygTNQt5YTtF3LsFj7+RkAlcp4SSo=";
};
build-system = [ pdm-backend ];

View File

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "vt-py";
version = "0.18.3";
version = "0.18.4";
pyproject = true;
disabled = pythonOlder "3.7";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "VirusTotal";
repo = "vt-py";
rev = "refs/tags/${version}";
hash = "sha256-Zu4lUniXfKaZ1SvX3YCzMLa76HgUWpmddV2N9buNS3o=";
hash = "sha256-pMljLoJBSLq1UxXn+iOeiebWgVfdxW8uzdXPsZtANuw=";
};
postPatch = ''

View File

@ -1,14 +1,14 @@
{ lib, buildGoModule, fetchFromGitHub, llvmPackages, getconf }:
buildGoModule rec {
buildGoModule {
pname = "gllvm";
version = "1.3.1";
version = "1.3.1-unstable-2024-04-28";
src = fetchFromGitHub {
owner = "SRI-CSL";
repo = "gllvm";
rev = "v${version}";
sha256 = "sha256-CoreqnMRuPuv+Ci1uyF3HJCJFwK2jwB79okynv6AHTA=";
rev = "154531bdd9c05cd9d01742bc1b35bdf200a487d3";
sha256 = "sha256-dxrtJFqEEDKx33+sOm+R7huBwbovlKzL4qFXoco8A4s=";
};
vendorHash = null;

View File

@ -10,13 +10,13 @@
buildGoModule rec {
pname = "fastly";
version = "10.14.0";
version = "10.14.1";
src = fetchFromGitHub {
owner = "fastly";
repo = "cli";
rev = "refs/tags/v${version}";
hash = "sha256-bYxA/+bzbam7fT9kAPZ7W5gLDu8l5vowL26OrD+qlCA=";
hash = "sha256-7awNvXlumeY6GXB91rUs8/rWIon0ig3C6S11fBdRj6Y=";
# The git commit is part of the `fastly version` original output;
# leave that output the same in nixpkgs. Use the `.git` directory
# to retrieve the commit SHA, and remove the directory afterwards,

View File

@ -7,11 +7,11 @@
stdenv.mkDerivation rec {
pname = "snappymail";
version = "2.37.3";
version = "2.38.0";
src = fetchurl {
url = "https://github.com/the-djmaze/snappymail/releases/download/v${version}/snappymail-${version}.tar.gz";
sha256 = "sha256-Fa6VbWPROkdVS8wHkXYCNR+DiBR6SqvfmrjGVlhhkwU=";
sha256 = "sha256-RoyV/dbhFGyiAV9LB09EIHAbZOiu11KeTeiPJRmFRwE=";
};
sourceRoot = "snappymail";

View File

@ -15,6 +15,19 @@ pkgs.runCommand "all-attrs-eval-under-tryEval" {
pkgs.gitMinimal
] ++ lib.optional pkgs.stdenv.isLinux pkgs.inotify-tools;
strictDeps = true;
src = with lib.fileset; toSource {
root = pkgs-path;
fileset = unions [
../../../default.nix
../../../doc
../../../lib
../../../maintainers
../../../nixos
../../../pkgs
../../../.version
];
};
}
''
datadir="${nix}/share"
@ -31,15 +44,8 @@ pkgs.runCommand "all-attrs-eval-under-tryEval" {
nix-store --init
cp -r ${pkgs-path}/lib lib
cp -r ${pkgs-path}/pkgs pkgs
cp -r ${pkgs-path}/default.nix default.nix
cp -r ${pkgs-path}/nixos nixos
cp -r ${pkgs-path}/maintainers maintainers
cp -r ${pkgs-path}/.version .version
cp -r ${pkgs-path}/doc doc
echo "Running pkgs/top-level/release-attrpaths-superset.nix"
nix-instantiate --eval --strict --json pkgs/top-level/release-attrpaths-superset.nix -A names > /dev/null
nix-instantiate --eval --strict --json $src/pkgs/top-level/release-attrpaths-superset.nix -A names > /dev/null
mkdir $out
echo success > $out/${nix.version}

View File

@ -7,11 +7,11 @@
}:
yarn2nix-moretea.mkYarnPackage {
version = "1.1.29";
version = "1.1.30";
src = fetchzip {
url = "https://registry.npmjs.org/meshcentral/-/meshcentral-1.1.29.tgz";
sha256 = "0ghwcndv753n3xkhi93jv0k9s0ch553g5q6b39fiv78ixa1f4h57";
url = "https://registry.npmjs.org/meshcentral/-/meshcentral-1.1.30.tgz";
sha256 = "1jdnjmwwi8ipqrxb43sas46n2hvr2fsccckknqlfzkfv0lkak07q";
};
patches = [ ./fix-js-include-paths.patch ];
@ -21,7 +21,7 @@ yarn2nix-moretea.mkYarnPackage {
offlineCache = fetchYarnDeps {
yarnLock = ./yarn.lock;
hash = "sha256-9fW6nZElij7P7rSS0xVxISpPpKdi9eOxQdmJ79jGSgw=";
hash = "sha256-1xDex/BIq1P+LbCuZfLRTckAU6RjF4XU73ZpEd1qncA=";
};
# Tarball has CRLF line endings. This makes patching difficult, so let's convert them.

View File

@ -1,6 +1,6 @@
{
"name": "meshcentral",
"version": "1.1.29",
"version": "1.1.30",
"keywords": [
"Remote Device Management",
"Remote Device Monitoring",
@ -39,11 +39,11 @@
"dependencies": {
"@yetzt/nedb": "1.8.0",
"archiver": "7.0.0",
"body-parser": "1.20.2",
"body-parser": "1.20.3",
"cbor": "5.2.0",
"compression": "1.7.4",
"cookie-session": "2.0.0",
"express": "4.19.2",
"express": "4.21.0",
"express-handlebars": "5.3.5",
"express-ws": "5.0.2",
"ipcheck": "0.1.0",
@ -72,12 +72,12 @@
"jwt-simple": "*",
"openid-client": "*",
"passport-saml": "*",
"archiver": "7.0.0",
"body-parser": "1.20.2",
"archiver": "7.0.1",
"body-parser": "1.20.3",
"cbor": "5.2.0",
"compression": "1.7.4",
"cookie-session": "2.0.0",
"express": "4.19.2",
"express": "4.21.0",
"express-handlebars": "5.3.5",
"express-ws": "5.0.2",
"ipcheck": "0.1.0",
@ -114,10 +114,9 @@
"@sendgrid/mail": "*",
"jsdom": "22.1.0",
"esprima": "4.0.1",
"minify-js": "0.0.4",
"html-minifier": "4.0.0",
"@crowdsec/express-bouncer": "0.1.0",
"archiver-zip-encrypted": "1.0.11",
"archiver-zip-encrypted": "2.0.0",
"googleapis": "128.0.0",
"webdav": "4.11.3",
"minio": "8.0.1",

File diff suppressed because it is too large Load Diff

View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage {
pname = "tere";
version = "1.5.1-unstable-2024-04-01";
version = "1.6.0";
src = fetchFromGitHub {
owner = "mgunyho";
repo = "tere";
rev = "659422ecb2810f91446a71e52b82524d4f1755d8";
sha256 = "sha256-CH8gcfkjSAknG6kKHp0aODcrjEJjzHbgeVaE/PK1zRA=";
rev = "5adf1176e8c12c073ad244cac7773a7808ed2021";
sha256 = "sha256-oY4oeSttM8LLXLirYq/B7Nzajkg4Pw26uig5gZxqU3s=";
};
cargoHash = "sha256-GtGWuvYdxP3dgGekoXYaM+lnZJBgJX1UIWe0EH+/52M=";
cargoHash = "sha256-UWZWm6wDiQqUNcWV1nDUWXVhWgqoVUCDWz09cRkiPKg=";
nativeBuildInputs = [
# ncurses provides the tput command needed for integration tests

File diff suppressed because it is too large Load Diff

View File

@ -1,42 +1,54 @@
{ stdenv
, lib
, fetchFromGitHub
, rustPlatform
, pkg-config
, openssl
, protobuf
, rdkafka
, oniguruma
, zstd
, rust-jemalloc-sys
, rust-jemalloc-sys-unprefixed
, Security
, libiconv
, coreutils
, CoreServices
, SystemConfiguration
, tzdata
, cmake
, perl
, git
{
stdenv,
lib,
fetchFromGitHub,
rustPlatform,
pkg-config,
openssl,
protobuf,
rdkafka,
oniguruma,
zstd,
rust-jemalloc-sys,
rust-jemalloc-sys-unprefixed,
Security,
libiconv,
coreutils,
CoreServices,
SystemConfiguration,
tzdata,
cmake,
perl,
git,
# nix has a problem with the `?` in the feature list
# enabling kafka will produce a vector with no features at all
, enableKafka ? false
enableKafka ? false,
# TODO investigate adding various "vendor-*"
# "disk-buffer" is using leveldb TODO: investigate how useful
# it would be, perhaps only for massive scale?
, features ? ([ "api" "api-client" "enrichment-tables" "sinks" "sources" "sources-dnstap" "transforms" "component-validation-runner" ]
features ? (
[
"api"
"api-client"
"enrichment-tables"
"sinks"
"sources"
"sources-dnstap"
"transforms"
"component-validation-runner"
]
# the second feature flag is passed to the rdkafka dependency
# building on linux fails without this feature flag (both x86_64 and AArch64)
++ lib.optionals enableKafka [ "rdkafka?/gssapi-vendored" ]
++ lib.optional stdenv.hostPlatform.isUnix "unix")
, nixosTests
, nix-update-script
++ lib.optional stdenv.hostPlatform.isUnix "unix"
),
nixosTests,
nix-update-script,
}:
let
pname = "vector";
version = "0.40.1";
version = "0.41.1";
in
rustPlatform.buildRustPackage {
inherit pname version;
@ -45,27 +57,54 @@ rustPlatform.buildRustPackage {
owner = "vectordotdev";
repo = pname;
rev = "v${version}";
hash = "sha256-1vFDFdO9E5mUAUfEdg9Ec5ptq2Kp7HpqNz5+9CMn30U=";
hash = "sha256-E6AVjxwXMDonqsAMcCpaZBEPCi9bVXUygG4PUOLh+ck=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"greptime-proto-0.1.0" = "sha256-Q8xr6qN6SAGGK0W96WuNRdQ5/8iNlruqzhXD6xq3Ua8=";
"greptimedb-client-0.1.0" = "sha256-evL8Q2Ikct9s0r4DWTgSP/8g4XTishuJHmwRoCfQFbU=";
"heim-0.1.0-rc.1" = "sha256-TFgLR5zb/oqceVOH4mIOvFFY/HMOLSo8VI5Eh9KP60E=";
"greptime-proto-0.1.0" = "sha256-QT3PZnHJoVghuRCGoZIH6L8jnX7Wn9eSuQqHIyrUY4E=";
"greptimedb-ingester-0.1.0" = "sha256-1M9yWXDZ6U9JTVyXQg9ZcSSGJp7GXtaCfQHdtjhw6FY=";
"heim-0.1.0-rc.1" = "sha256-pMraYKr6srTQqEzoBx9gGHHlJ7nMKwj50ftimQAkfL0=";
"nix-0.26.2" = "sha256-uquYvRT56lhupkrESpxwKEimRFhmYvri10n3dj0f2yg=";
"ntapi-0.3.7" = "sha256-G6ZCsa3GWiI/FeGKiK9TWkmTxen7nwpXvm5FtjNtjWU=";
"tokio-util-0.7.8" = "sha256-HCvtfohOoa1ZjD4s7QLDbIV4fe/MVBKtgM1QQX7gGKQ=";
"tokio-util-0.7.11" = "sha256-oV9fSPjLMY1KbcbDP2WTVjF/N0qlQBPDIYHOp3aNCTY=";
"tracing-0.2.0" = "sha256-YAxeEofFA43PX2hafh3RY+C81a2v6n1fGzYz2FycC3M=";
};
};
nativeBuildInputs = [ pkg-config cmake perl git rustPlatform.bindgenHook ];
nativeBuildInputs = [
pkg-config
cmake
perl
git
rustPlatform.bindgenHook
];
buildInputs =
[ oniguruma openssl protobuf rdkafka zstd ]
[
oniguruma
openssl
protobuf
rdkafka
zstd
]
++ lib.optionals stdenv.isLinux [ rust-jemalloc-sys-unprefixed ]
++ lib.optionals stdenv.isDarwin [ rust-jemalloc-sys Security libiconv coreutils CoreServices SystemConfiguration ];
++ lib.optionals stdenv.isDarwin [
rust-jemalloc-sys
Security
libiconv
coreutils
CoreServices
SystemConfiguration
];
# Rust 1.80.0 introduced the unexepcted_cfgs lint, which requires crates to allowlist custom cfg options that they inspect.
# Upstream is working on fixing this in https://github.com/vectordotdev/vector/pull/20949, but silencing the lint lets us build again until then.
# TODO remove when upgrading Vector
RUSTFLAGS = "--allow unexpected_cfgs";
# Without this, we get SIGSEGV failure
RUST_MIN_STACK = 33554432;
# needed for internal protobuf c wrapper library
PROTOC = "${protobuf}/bin/protoc";
@ -75,7 +114,7 @@ rustPlatform.buildRustPackage {
TZDIR = "${tzdata}/share/zoneinfo";
# needed to dynamically link rdkafka
CARGO_FEATURE_DYNAMIC_LINKING=1;
CARGO_FEATURE_DYNAMIC_LINKING = 1;
CARGO_PROFILE_RELEASE_LTO = "fat";
CARGO_PROFILE_RELEASE_CODEGEN_UNITS = "1";
@ -115,12 +154,14 @@ rustPlatform.buildRustPackage {
# transforms-geoip is patched out of Cargo.toml for now - unless explicitly asked for.
postPatch = ''
substituteInPlace ./src/dns.rs \
--replace "#[tokio::test]" ""
--replace-fail "#[tokio::test]" ""
'';
passthru = {
inherit features;
tests = { inherit (nixosTests) vector; };
tests = {
inherit (nixosTests) vector;
};
updateScript = nix-update-script { };
};
@ -128,7 +169,10 @@ rustPlatform.buildRustPackage {
description = "High-performance observability data pipeline";
homepage = "https://github.com/vectordotdev/vector";
license = licenses.mpl20;
maintainers = with maintainers; [ thoughtpolice happysalada ];
maintainers = with maintainers; [
thoughtpolice
happysalada
];
platforms = with platforms; all;
mainProgram = "vector";
};

View File

@ -6,16 +6,16 @@
buildGoModule rec {
pname = "dnsproxy";
version = "0.73.1";
version = "0.73.2";
src = fetchFromGitHub {
owner = "AdguardTeam";
repo = "dnsproxy";
rev = "v${version}";
hash = "sha256-SEjAt/FiVLcLkwYGQkR0iSKcicy5s2vA/1J74pIvv4E=";
hash = "sha256-Xxi23Cwm389fsDcYa3qJ9GhDZVXwh/LiWPfiYMuG5Js=";
};
vendorHash = "sha256-ELGiyKWhR/4bVn5g2OLLe0njavrziD5nvwFUMwSC7s4=";
vendorHash = "sha256-tyEp0vY8hWE8jTvkxKuqQJcgeey+c50pxREpmlZWE24=";
ldflags = [
"-s"

View File

@ -1,256 +0,0 @@
From b85cef7cd9a3d7367c41b7deca8264652e88014a Mon Sep 17 00:00:00 2001
From: Bryan Lai <bryanlais@gmail.com>
Date: Fri, 16 Aug 2024 20:14:28 +0800
Subject: [PATCH] deps: bump `time`, fix build for rust 1.80
With: cargo update time --recursive
Note that `cargo update` without the `--recursive` flag would be
executed "conservatively". Basically, `cargo update time` will try
its best to _not_ bump the dependencies of `time`. This restricts
the amount that `time` itself can be updated.
To really get the latest version, one has to add a `--recursive` flag.
Only by doing this can we ensure that time is updated to the latest
semver compatible version. In our case,
- without `--recursive`, time only gets updated to 0.3.26
- with `--recursive`, time gets updated to the latest 0.3.36,
with a couple of other dependencies updated
---
Cargo.lock | 84 +++++++++++++++++++++++++++++++++++-------------------
1 file changed, 55 insertions(+), 29 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index 5bd0f35..a7c7cf8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -200,7 +200,7 @@ dependencies = [
"heck",
"proc-macro2",
"quote",
- "syn 2.0.15",
+ "syn 2.0.74",
]
[[package]]
@@ -317,7 +317,7 @@ dependencies = [
"proc-macro2",
"quote",
"scratch",
- "syn 2.0.15",
+ "syn 2.0.74",
]
[[package]]
@@ -334,7 +334,7 @@ checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.15",
+ "syn 2.0.74",
]
[[package]]
@@ -372,6 +372,16 @@ dependencies = [
"syn 1.0.109",
]
+[[package]]
+name = "deranged"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
+dependencies = [
+ "powerfmt",
+ "serde",
+]
+
[[package]]
name = "errno"
version = "0.3.1"
@@ -511,9 +521,9 @@ dependencies = [
[[package]]
name = "itoa"
-version = "1.0.6"
+version = "1.0.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6"
+checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
[[package]]
name = "js-sys"
@@ -532,9 +542,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
[[package]]
name = "libc"
-version = "0.2.142"
+version = "0.2.156"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a987beff54b60ffa6d51982e1aa1146bc42f19bd26be28b0586f252fccf5317"
+checksum = "a5f43f184355eefb8d17fc948dbecf6c13be3c141f20d834ae842193a448c72a"
[[package]]
name = "link-cplusplus"
@@ -618,6 +628,12 @@ dependencies = [
"time",
]
+[[package]]
+name = "num-conv"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+
[[package]]
name = "num-integer"
version = "0.1.45"
@@ -639,9 +655,9 @@ dependencies = [
[[package]]
name = "num_threads"
-version = "0.1.6"
+version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44"
+checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9"
dependencies = [
"libc",
]
@@ -722,20 +738,26 @@ version = "0.2.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
+[[package]]
+name = "powerfmt"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
+
[[package]]
name = "proc-macro2"
-version = "1.0.56"
+version = "1.0.86"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
dependencies = [
"unicode-ident",
]
[[package]]
name = "quote"
-version = "1.0.26"
+version = "1.0.36"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
dependencies = [
"proc-macro2",
]
@@ -837,22 +859,22 @@ checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1"
[[package]]
name = "serde"
-version = "1.0.160"
+version = "1.0.208"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c"
+checksum = "cff085d2cb684faa248efb494c39b68e522822ac0de72ccf08109abde717cfb2"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.160"
+version = "1.0.208"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df"
+checksum = "24008e81ff7613ed8e5ba0cfaf24e2c2f1e5b8a0495711e44fcd4882fca62bcf"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.15",
+ "syn 2.0.74",
]
[[package]]
@@ -981,9 +1003,9 @@ dependencies = [
[[package]]
name = "syn"
-version = "2.0.15"
+version = "2.0.74"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822"
+checksum = "1fceb41e3d546d0bd83421d3409b1460cc7444cd389341a4c880fe7a042cb3d7"
dependencies = [
"proc-macro2",
"quote",
@@ -1026,7 +1048,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.15",
+ "syn 2.0.74",
]
[[package]]
@@ -1041,13 +1063,16 @@ dependencies = [
[[package]]
name = "time"
-version = "0.3.20"
+version = "0.3.36"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890"
+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
dependencies = [
+ "deranged",
"itoa",
"libc",
+ "num-conv",
"num_threads",
+ "powerfmt",
"serde",
"time-core",
"time-macros",
@@ -1055,16 +1080,17 @@ dependencies = [
[[package]]
name = "time-core"
-version = "0.1.0"
+version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd"
+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
[[package]]
name = "time-macros"
-version = "0.2.8"
+version = "0.2.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36"
+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
dependencies = [
+ "num-conv",
"time-core",
]
@@ -1121,9 +1147,9 @@ dependencies = [
[[package]]
name = "unicode-ident"
-version = "1.0.8"
+version = "1.0.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
[[package]]
name = "unicode-segmentation"
--
2.45.2

View File

@ -6,20 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "nix-melt";
version = "0.1.2";
version = "0.1.3";
src = fetchFromGitHub {
owner = "nix-community";
repo = "nix-melt";
rev = "v${version}";
hash = "sha256-5V9sPbBb9t4B6yiLrYF+hx6YokGDH6+UsVQBhgqxMbY=";
hash = "sha256-jx7g9GOFAjOlJyNsGOUTLh2qWII9u0prOoBEvNPmdj8=";
};
cargoPatches = [
./0001-fix-build-for-rust-1.80.patch
];
cargoHash = "sha256-oEZTBb9dwnZvByULtgCm17KbWc9hjURLB0KDkqRRCr0=";
cargoHash = "sha256-CVMQPnSwGErZnf5/iAcVy37VlJjZdO/BkO3C/rlpl/w=";
nativeBuildInputs = [
installShellFiles