Merge master into haskell-updates

This commit is contained in:
github-actions[bot] 2024-04-08 00:13:03 +00:00 committed by GitHub
commit 2b3866f5fc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
287 changed files with 8634 additions and 3944 deletions

View File

@ -16,6 +16,10 @@ jobs:
with:
# pull_request_target checks out the base branch by default
ref: refs/pull/${{ github.event.pull_request.number }}/merge
# Only these directories to perform the check
sparse-checkout: |
lib
maintainers
- uses: cachix/install-nix-action@8887e596b4ee1134dae06b98d573bd674693f47c # v26
with:
# explicitly enable sandbox

View File

@ -14,6 +14,7 @@ fish.section.md
fuse.section.md
ibus.section.md
kakoune.section.md
krita.section.md
linux.section.md
locales.section.md
etc-files.section.md

View File

@ -0,0 +1,37 @@
# Krita {#sec-krita}
## Python plugins {#krita-python-plugins}
"pykrita" plugins should be installed following
[Krita's manual](https://docs.krita.org/en/user_manual/python_scripting/install_custom_python_plugin.html).
This generally involves extracting the extension to `~/.local/share/krita/pykrita/`.
## Binary plugins {#krita-binary-plugins}
Binary plugins are Dynamically Linked Libraries to be loaded by Krita.
_Note: You most likely won't need to deal with binary plugins,
all known plugins are bundled and enabled by default._
### Installing binary plugins {#krita-install-binary-plugins}
You can choose what plugins are added to Krita by overriding the
`binaryPlugins` attribute.
If you want to add plugins instead of replacing, you can read the
list of previous plugins via `pkgs.krita.binaryPlugins`:
```nix
(pkgs.krita.override (old: {
binaryPlugins = old.binaryPlugins ++ [ your-plugin ];
}))
```
### Example structure of a binary plugin {#krita-binary-plugin-structure}
```
/nix/store/00000000000000000000000000000000-krita-plugin-example-1.2.3
└── lib
└── kritaplugins
└── krita_example.so
```

View File

@ -2,11 +2,11 @@
Some packages provide the shell integration to be more useful. But unlike other systems, nix doesn't have a standard `share` directory location. This is why a bunch `PACKAGE-share` scripts are shipped that print the location of the corresponding shared folder. Current list of such packages is as following:
- `fzf` : `fzf-share`
- `sk` : `sk-share`
E.g. `fzf` can then be used in the `.bashrc` like this:
E.g. `sk` can then be used in the `.bashrc` like this:
```bash
source "$(fzf-share)/completion.bash"
source "$(fzf-share)/key-bindings.bash"
source "$(sk-share)/completion.bash"
source "$(sk-share)/key-bindings.bash"
```

View File

@ -1558,6 +1558,12 @@
githubId = 160646;
name = "Patrick Jackson";
};
arduano = {
email = "leonid.shchurov@gmail.com";
github = "arduano";
githubId = 13347712;
name = "Leo Shchurov";
};
ardumont = {
email = "eniotna.t@gmail.com";
github = "ardumont";
@ -1989,12 +1995,6 @@
githubId = 687218;
name = "averelld";
};
avery = {
email = "averyl+nixos@protonmail.com";
github = "AveryLychee";
githubId = 9147625;
name = "Avery Lychee";
};
avh4 = {
email = "gruen0aermel@gmail.com";
github = "avh4";
@ -3248,6 +3248,12 @@
matrix = "@cawilliamson:nixos.dev";
name = "Christopher A. Williamson";
};
cbarrete = {
github = "cbarrete";
githubId = 62146989;
matrix = "@cedric:cbarrete.com";
name = "Cédric Barreteau";
};
cbleslie = {
email = "cameronleslie@gmail.com";
github = "cbleslie";
@ -14423,6 +14429,12 @@
githubId = 42322511;
name = "Patryk Kwiatek";
};
nokazn = {
email = "me@nokazn.me";
github = "nokazn";
githubId = 41154684;
name = "nokazn";
};
nomeata = {
email = "mail@joachim-breitner.de";
github = "nomeata";
@ -17817,6 +17829,17 @@
fingerprint = "0AF6 4C3B 1F12 14B3 8C8C 5786 1FA2 DBE6 7438 7CC3";
}];
};
sebrut = {
email = "kontakt@sebastian-rutofski.de";
github = "sebrut";
githubId = 3962409;
name = "Sebastian Rutofski";
keys = [
{
fingerprint = "F1D4 8061 2830 3AF6 42DC 3867 C37F 3374 2A95 C547";
}
];
};
sebtm = {
email = "mail@sebastian-sellmeier.de";
github = "SebTM";
@ -21063,6 +21086,12 @@
githubId = 357664;
name = "Viktor Petersson";
};
vpochapuis = {
email = "vincent.professional@chapuis.ovh";
github = "vpochapuis";
githubId = 75721408;
name = "Vincent Chapuis";
};
vq = {
email = "vq@erq.se";
github = "vq";

View File

@ -79,7 +79,7 @@ In addition to numerous new and updated packages, this release has the following
- [frigate](https://frigate.video), an open source NVR built around real-time AI object detection. Available as [services.frigate](#opt-services.frigate.enable).
- [fzf](https://github.com/junegunn/fzf), a command line fuzzyfinder. Available as [programs.fzf](#opt-programs.fzf.fuzzyCompletion).
- [fzf](https://github.com/junegunn/fzf), a command line fuzzyfinder. Available as [programs.fzf](#opt-programs.fzf.enable).
- [gemstash](https://github.com/rubygems/gemstash), a RubyGems.org cache and private gem server. Available as [services.gemstash](#opt-services.gemstash.enable).

View File

@ -98,7 +98,7 @@ Use `services.pipewire.extraConfig` or `services.pipewire.configPackages` for Pi
- [ollama](https://ollama.ai), server for running large language models locally.
- [Mihomo](https://github.com/MetaCubeX/mihomo), a rule-based proxy in Go. Available as [services.mihomo.enable](#opt-services.mihomo.enable).
- [Mihomo](https://github.com/MetaCubeX/mihomo/tree/Alpha), a rule-based proxy in Go. Available as [services.mihomo.enable](#opt-services.mihomo.enable).
- [hebbot](https://github.com/haecker-felix/hebbot), a Matrix bot to generate "This Week in X" like blog posts. Available as [services.hebbot](#opt-services.hebbot.enable).
@ -304,6 +304,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
- `xxd` has been moved from `vim` default output to its own output to reduce closure size. The canonical way to reference it across all platforms is `unixtools.xxd`.
- `programs.fzf.keybindings` and `programs.fzf.fuzzyCompletion` got replaced by `programs.fzf.enabled` as shell-completion is included in the fzf-binary now there is no easy option to load completion and keybindings separately. Please consult fzf-documentation on how to configure/disable certain keybindings.
- The `stalwart-mail` package has been updated to v0.5.3, which includes [breaking changes](https://github.com/stalwartlabs/mail-server/blob/v0.5.3/UPGRADING.md).
- `services.zope2` has been removed as `zope2` is unmaintained and was relying on Python2.
@ -506,7 +508,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
- `services.kavita` now uses the freeform option `services.kavita.settings` for the application settings file.
The options `services.kavita.ipAdresses` and `services.kavita.port` now exist at `services.kavita.settings.IpAddresses`
and `services.kavita.settings.IpAddresses`.
and `services.kavita.settings.IpAddresses`. The file at `services.kavita.tokenKeyFile` now needs to contain a secret with
512+ bits instead of 128+ bits.
- The `krb5` module has been rewritten and moved to `security.krb5`, moving all options but `security.krb5.enable` and `security.krb5.package` into `security.krb5.settings`.

View File

@ -1,32 +1,46 @@
{ pkgs, config, lib, ... }:
with lib;
let
cfg = config.programs.fzf;
in
{
options = {
programs.fzf = {
fuzzyCompletion = mkEnableOption (mdDoc "fuzzy completion with fzf");
keybindings = mkEnableOption (mdDoc "fzf keybindings");
};
};
config = {
environment.systemPackages = optional (cfg.keybindings || cfg.fuzzyCompletion) pkgs.fzf;
imports = [
(lib.mkRemovedOptionModule [ "programs" "fzf" "keybindings" ] ''
Use "programs.fzf.enabled" instead, due to fzf upstream-change it's not possible to load shell-completion and keybindings separately.
If you want to change/disable certain keybindings please check the fzf-documentation.
'')
(lib.mkRemovedOptionModule [ "programs" "fzf" "fuzzyCompletion" ] ''
Use "programs.fzf.enabled" instead, due to fzf upstream-change it's not possible to load shell-completion and keybindings separately.
If you want to change/disable certain keybindings please check the fzf-documentation.
'')
];
programs.bash.interactiveShellInit = optionalString cfg.fuzzyCompletion ''
source ${pkgs.fzf}/share/fzf/completion.bash
'' + optionalString cfg.keybindings ''
source ${pkgs.fzf}/share/fzf/key-bindings.bash
options = {
programs.fzf.enable = mkEnableOption (mdDoc "fuzzy completion with fzf and keybindings");
};
config = mkIf cfg.enable {
environment.systemPackages = [ pkgs.fzf ];
programs.bash.interactiveShellInit = ''
eval "$(${getExe pkgs.fzf} --bash)"
'';
programs.zsh.interactiveShellInit = optionalString (!config.programs.zsh.ohMyZsh.enable)
(optionalString cfg.fuzzyCompletion ''
source ${pkgs.fzf}/share/fzf/completion.zsh
'' + optionalString cfg.keybindings ''
source ${pkgs.fzf}/share/fzf/key-bindings.zsh
'');
programs.fish.interactiveShellInit = ''
${getExe pkgs.fzf} --fish | source
'';
programs.zsh.ohMyZsh.plugins = lib.mkIf (cfg.keybindings || cfg.fuzzyCompletion) [ "fzf" ];
programs.zsh = {
interactiveShellInit = optionalString (!config.programs.zsh.ohMyZsh.enable) ''
eval "$(${getExe pkgs.fzf} --zsh)"
'';
ohMyZsh.plugins = mkIf (config.programs.zsh.ohMyZsh.enable) [ "fzf" ];
};
};
meta.maintainers = with maintainers; [ laalsaas ];
}

View File

@ -4,26 +4,28 @@ let
cfg = config.programs.oddjobd;
in
{
options.programs.oddjobd = {
enable = lib.mkEnableOption "oddjob";
package = lib.mkPackageOption pkgs "oddjob" {};
options = {
programs.oddjobd = {
enable = lib.mkEnableOption "oddjob";
package = lib.mkPackageOption pkgs "oddjob" {};
};
};
config = lib.mkIf cfg.enable {
systemd.packages = [ cfg.package ];
systemd.services.oddjobd = {
wantedBy = [ "multi-user.target"];
after = [ "network.target"];
wantedBy = [ "multi-user.target" ];
after = [ "network.target" "dbus.service" ];
description = "DBUS Odd-job Daemon";
enable = true;
documentation = [ "man:oddjobd(8)" "man:oddjobd.conf(5)" ];
serviceConfig = {
Type = "dbus";
BusName = "org.freedesktop.oddjob";
ExecStart = "${lib.getBin cfg.package}/bin/oddjobd";
Type = "simple";
PIDFile = "/run/oddjobd.pid";
ExecStart = "${lib.getBin cfg.package}/bin/oddjobd -n -p /run/oddjobd.pid -t 300";
};
};
services.dbus.packages = [ cfg.package ];
};
meta.maintainers = with lib.maintainers; [ SohamG ];

View File

@ -13,7 +13,7 @@ in
{
options.programs.hyprland = {
enable = mkEnableOption null // {
description = mdDoc ''
description = ''
Hyprland, the dynamic tiling Wayland compositor that doesn't sacrifice on its looks.
You can manually launch Hyprland by executing {command}`Hyprland` on a TTY.
@ -33,14 +33,24 @@ in
};
defaultText = literalExpression
"`programs.hyprland.package` with applied configuration";
description = mdDoc ''
description = ''
The Hyprland package after applying configuration.
'';
};
portalPackage = mkPackageOption pkgs "xdg-desktop-portal-hyprland" { };
xwayland.enable = mkEnableOption (mdDoc "XWayland") // { default = true; };
xwayland.enable = mkEnableOption ("XWayland") // { default = true; };
systemd.setPath.enable = mkEnableOption null // {
default = true;
example = false;
description = ''
Set environment path of systemd to include the current system's bin directory.
This is needed in Hyprland setups, where opening links in applications do not work.
Enabled by default.
'';
};
};
config = mkIf cfg.enable {
@ -63,6 +73,12 @@ in
extraPortals = [ finalPortalPackage ];
configPackages = mkDefault [ cfg.finalPackage ];
};
systemd = mkIf cfg.systemd.setPath.enable {
user.extraConfig = ''
DefaultEnvironment="PATH=$PATH:/run/current-system/sw/bin:/etc/profiles/per-user/$USER/bin:/run/wrappers/bin"
'';
};
};
imports = with lib; [

View File

@ -353,6 +353,10 @@ let
See <https://tools.ietf.org/html/rfc4366#section-3.1>
'';
grpc-compression = mkParam types.str ''
Compression algorithm to use for gRPC requests to other clients.
'';
web.route-prefix = mkParam types.str ''
Prefix for API and UI endpoints.
@ -642,6 +646,10 @@ let
receive = params.common cfg.receive // params.objstore cfg.receive // {
receive.grpc-compression = mkParam types.str ''
Compression algorithm to use for gRPC requests to other receivers.
'';
remote-write.address = mkParamDef types.str "0.0.0.0:19291" ''
Address to listen on for remote write requests.
'';

View File

@ -12,7 +12,7 @@ let
in
{
options.services.mihomo = {
enable = lib.mkEnableOption "Mihomo, A rule-based proxy in Go.";
enable = lib.mkEnableOption "Mihomo, A rule-based proxy in Go";
package = lib.mkPackageOption pkgs "mihomo" { };
@ -28,14 +28,14 @@ in
description = ''
Local web interface to use.
You can also use the following website, just in case:
You can also use the following website:
- metacubexd:
- https://d.metacubex.one
- https://metacubex.github.io/metacubexd
- https://metacubexd.pages.dev
- yacd:
- https://yacd.haishan.me
- clash-dashboard (buggy):
- clash-dashboard:
- https://clash.razord.top
'';
};
@ -49,7 +49,7 @@ in
tunMode = lib.mkEnableOption ''
necessary permission for Mihomo's systemd service for TUN mode to function properly.
Keep in mind, that you still need to enable TUN mode manually in Mihomo's configuration.
Keep in mind, that you still need to enable TUN mode manually in Mihomo's configuration
'';
};

View File

@ -213,8 +213,7 @@ in
preStart = ''
${pkg}/opt/healthchecks/manage.py collectstatic --no-input
${pkg}/opt/healthchecks/manage.py remove_stale_contenttypes --no-input
${pkg}/opt/healthchecks/manage.py compress
'';
'' + lib.optionalString (cfg.settings.DEBUG != "True") "${pkg}/opt/healthchecks/manage.py compress";
serviceConfig = commonConfig // {
Restart = "always";

View File

@ -34,8 +34,8 @@ in
tokenKeyFile = lib.mkOption {
type = lib.types.path;
description = lib.mdDoc ''
A file containing the TokenKey, a secret with at 128+ bits.
It can be generated with `head -c 32 /dev/urandom | base64`.
A file containing the TokenKey, a secret with at 512+ bits.
It can be generated with `head -c 64 /dev/urandom | base64 --wrap=0`.
'';
};

View File

@ -57,7 +57,9 @@ let
# bcachefs does not support mounting devices with colons in the path, ergo we don't (see #49671)
firstDevice = fs: lib.head (lib.splitString ":" fs.device);
openCommand = name: fs: if config.boot.initrd.clevis.enable && (lib.hasAttr (firstDevice fs) config.boot.initrd.clevis.devices) then ''
useClevis = fs: config.boot.initrd.clevis.enable && (lib.hasAttr (firstDevice fs) config.boot.initrd.clevis.devices);
openCommand = name: fs: if useClevis fs then ''
if clevis decrypt < /etc/clevis/${firstDevice fs}.jwe | bcachefs unlock ${firstDevice fs}
then
printf "unlocked ${name} using clevis\n"
@ -92,8 +94,19 @@ let
# As is, RemainAfterExit doesn't accomplish anything.
RemainAfterExit = true;
};
script = ''
${config.boot.initrd.systemd.package}/bin/systemd-ask-password --timeout=0 "enter passphrase for ${name}" | exec ${pkgs.bcachefs-tools}/bin/bcachefs unlock "${device}"
script = let
unlock = ''${pkgs.bcachefs-tools}/bin/bcachefs unlock "${device}"'';
unlockInteractively = ''${config.boot.initrd.systemd.package}/bin/systemd-ask-password --timeout=0 "enter passphrase for ${name}" | exec ${unlock}'';
in if useClevis fs then ''
if ${config.boot.initrd.clevis.package}/bin/clevis decrypt < "/etc/clevis/${device}.jwe" | ${unlock}
then
printf "unlocked ${name} using clevis\n"
else
printf "falling back to interactive unlocking...\n"
${unlockInteractively}
fi
'' else ''
${unlockInteractively}
'';
};
};

View File

@ -652,6 +652,7 @@ in {
nzbget = handleTest ./nzbget.nix {};
nzbhydra2 = handleTest ./nzbhydra2.nix {};
ocis = handleTest ./ocis.nix {};
oddjobd = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./oddjobd.nix {};
oh-my-zsh = handleTest ./oh-my-zsh.nix {};
ollama = handleTest ./ollama.nix {};
ombi = handleTest ./ombi.nix {};

View File

@ -38,6 +38,8 @@
clevisZfs
clevisZfsFallback
gptAutoRoot
clevisBcachefs
clevisBcachefsFallback
;
}

23
nixos/tests/oddjobd.nix Normal file
View File

@ -0,0 +1,23 @@
import ./make-test-python.nix ({ pkgs, lib, ... }: {
name = "oddjobd";
meta.maintainers = [ lib.maintainers.anthonyroussel ];
nodes.machine = { ... } : {
environment.systemPackages = [
pkgs.oddjob
];
programs.oddjobd.enable = true;
};
testScript = ''
start_all()
machine.wait_for_unit("oddjobd.service")
machine.wait_for_file("/run/oddjobd.pid")
with subtest("send oddjob listall request"):
result = machine.succeed("oddjob_request -s com.redhat.oddjob -o /com/redhat/oddjob -i com.redhat.oddjob listall")
assert ('(service="com.redhat.oddjob",object="/com/redhat/oddjob",interface="com.redhat.oddjob",method="listall")' in result)
'';
})

View File

@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchurl
, fetchpatch
, fetchFromGitHub
, avahi
, bluez
, boost
@ -42,29 +41,19 @@ let
inherit (lib) optional;
in
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "guitarix";
version = "0.44.1";
version = "0.46.0";
src = fetchurl {
url = "mirror://sourceforge/guitarix/guitarix2-${version}.tar.xz";
sha256 = "d+g9dU9RrDjFQj847rVd5bPiYSjmC1EbAtLe/PNubBg=";
src = fetchFromGitHub {
owner = "brummer10";
repo = "guitarix";
rev = "V${finalAttrs.version}";
fetchSubmodules = true;
hash = "sha256-AftC6fQEDzG/3C/83YbK/++bRgP7vPD0E2X6KEWpowc=";
};
patches = [
(fetchpatch {
name = "gcc13-fixes.patch";
url = "https://github.com/brummer10/guitarix/commit/b52736180b6966f24398f8a5ad179a58173473ec.patch";
hash = "sha256-+jilgLujy/B6ijUb8NHzt3+4IKCt17X8LmuMLdmsvGw=";
relative = "trunk";
})
];
# doesnt apply cleanly, so doing with substituteInPlace
# https://github.com/brummer10/guitarix/commit/39d7c21c4173eb0f121b1bbff439d9cf43331a00.patch
postPatch = ''
substituteInPlace wscript --replace "open(src_fname, 'rU')" "open(src_fname, 'r')"
'';
sourceRoot = "${finalAttrs.src.name}/trunk";
nativeBuildInputs = [
gettext
@ -140,9 +129,9 @@ stdenv.mkDerivation rec {
clean-sounds, nice overdrive, fat distortion and a diversity of
crazy sounds never heard before.
'';
homepage = "http://guitarix.sourceforge.net/";
homepage = "https://github.com/brummer10/guitarix";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ astsmtl goibhniu ];
maintainers = with maintainers; [ astsmtl goibhniu lord-valen ];
platforms = platforms.linux;
};
}
})

View File

@ -1,16 +1,17 @@
{ lib
, fetchPypi
, python3
{
lib,
fetchPypi,
python3,
}:
python3.pkgs.buildPythonPackage rec {
pname = "ledfx";
version = "2.0.94";
version = "2.0.96";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-l498NXt3Ib9QLTWoJcpngAwkbY6JqLbVLKhTWQye7Fs=";
hash = "sha256-nvPHAnoD5j1rneeuMufQkXj8YWXau2zJYug+Avpe87I=";
};
pythonRelaxDeps = true;
@ -20,13 +21,14 @@ python3.pkgs.buildPythonPackage rec {
"rpi-ws281x"
];
nativeBuildInputs = with python3.pkgs; [
build-system = with python3.pkgs; [
cython
poetry-core
pythonRelaxDepsHook
];
propagatedBuildInputs = with python3.pkgs; [
nativeBuildInputs = with python3.pkgs; [ pythonRelaxDepsHook ];
dependencies = with python3.pkgs; [
aiohttp
aiohttp-cors
aubio

View File

@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "linuxsampler";
version = "2.3.0";
version = "2.3.1";
src = fetchurl {
url = "https://download.linuxsampler.org/packages/${pname}-${version}.tar.bz2";
sha256 = "sha256-Ii+dylTUXmazP8NVjAAMdHs7NK+puml0IrF4fc6DEls=";
sha256 = "sha256-T7quk5N5JBiPqIziQd0vaCr8tLDbwS6otz6egY01OTE=";
};
preConfigure = ''

View File

@ -16,7 +16,7 @@
, ninja
, pkg-config
, python3
, wrapGAppsHook
, wrapGAppsHook4
}:
stdenv.mkDerivation rec {
@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
ninja
pkg-config
python3
wrapGAppsHook
wrapGAppsHook4
];
buildInputs = [
@ -58,6 +58,8 @@ stdenv.mkDerivation rec {
];
postPatch = ''
substituteInPlace data/meson_post_install.py \
--replace-fail 'gtk-update-icon-cache' 'gtk4-update-icon-cache'
patchShebangs data/meson_post_install.py
patchShebangs libparlatype/tests/data/generate_config_data
'';

View File

@ -6,13 +6,13 @@
python3Packages.buildPythonApplication rec {
pname = "pyradio";
version = "0.9.2.25";
version = "0.9.3.1";
src = fetchFromGitHub {
owner = "coderholic";
repo = "pyradio";
rev = "refs/tags/${version}";
hash = "sha256-GkOp0iK84HDvVH8RmtmIKJ5EtQIECgZS5g8pmaIhUcc=";
hash = "sha256-p3F4uN+hkxGp+216abUkFNM5uF/0e0sQHKk5WIpULso=";
};
nativeBuildInputs = [
@ -42,6 +42,6 @@ python3Packages.buildPythonApplication rec {
mainProgram = "pyradio";
changelog = "https://github.com/coderholic/pyradio/releases/tag/${version}";
license = licenses.mit;
maintainers = with maintainers; [ contrun ];
maintainers = with maintainers; [ contrun yayayayaka ];
};
}

View File

@ -28,13 +28,13 @@ let
in
stdenv.mkDerivation rec {
pname = "reaper";
version = "7.11";
version = "7.13";
src = fetchurl {
url = url_for_platform version stdenv.hostPlatform.qemuArch;
hash = if stdenv.isDarwin then "sha256-8GWfrr+kKF3Ei6Fed9Oei461veRXXbTICvyNJNLBbYM=" else {
x86_64-linux = "sha256-lpgGXHWWhhs1jLllq5C3UhOLgLyMTE6qWFiGkBcuWlo=";
aarch64-linux = "sha256-0iTdrZYjKzPyNLMIM4othtAMox/65HBEy1VickOZFnA=";
hash = if stdenv.isDarwin then "sha256-g9t1vCPKTw68w6/b401OAdMNth4UlT9Obht6oPArqKY=" else {
x86_64-linux = "sha256-Zj+3LXNoHD6+v0dDn8mKqN14Y9Tk2+fZ4W343VjZoLw=";
aarch64-linux = "sha256-kbonwYlEd13AIzy1DNbsFwy+rRrQpOTrup3NZpJOmUA=";
}.${stdenv.hostPlatform.system};
};

View File

@ -26,13 +26,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "tauon";
version = "7.7.1";
version = "7.7.2";
src = fetchFromGitHub {
owner = "Taiko2k";
repo = "TauonMusicBox";
rev = "v${finalAttrs.version}";
hash = "sha256-rRYM8wdvwfetoIpS/lzAV/uV5XVpXyXsHSrClPWcsCo=";
hash = "sha256-IVl7XL6nn42zaY4bDraF9os0dXfquUql4E96djfVdVg=";
};
postUnpack = ''

View File

@ -64,7 +64,7 @@
, sratom
, texi2html
, vamp-plugin-sdk
, wrapGAppsHook
, wrapGAppsHook4
, xdg-utils
, xxHash
, zix
@ -112,7 +112,7 @@ stdenv.mkDerivation rec {
python3.pkgs.sphinx
sassc
texi2html
wrapGAppsHook
wrapGAppsHook4
];
buildInputs = [

File diff suppressed because it is too large Load Diff

View File

@ -60,20 +60,11 @@ rustPlatform.buildRustPackage rec {
inherit hash;
};
# fix build with rust 1.70+
patches = [
(fetchpatch {
url = "https://github.com/solana-labs/solana/commit/9e703f85de4184f577f22a1c72a0d33612f2feb1.patch";
hash = "sha256-bAKTIQ6FhTk6bIddYULwLfdH5kzNPw1ltXJEfawtAXg=";
includes = [ "sdk/program/src/account_info.rs" ];
})
];
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"crossbeam-epoch-0.9.5" = "sha256-Jf0RarsgJiXiZ+ddy0vp4jQ59J9m0k3sgXhWhCdhgws=";
"ntapi-0.3.7" = "sha256-G6ZCsa3GWiI/FeGKiK9TWkmTxen7nwpXvm5FtjNtjWU=";
"tokio-1.29.1" = "sha256-Z/kewMCqkPVTXdoBcSaFKG5GSQAdkdpj3mAzLLCjjGk=";
};
};

View File

@ -1,4 +1,4 @@
{
"version": "1.16.26",
"hash": "sha256-0OMZO2aKoaeRCkswXDXV9Y6HnYLzpkqqFPVIW2P5TwE="
"version": "1.17.28",
"hash": "sha256-y79zsUfYsX377ofsFSg9a2il99uJsA+qdCu3J+EU5nQ="
}

View File

@ -2,7 +2,7 @@
, rustPlatform
, fetchFromGitHub
, pkg-config
, wrapGAppsHook
, wrapGAppsHook4
, glib
, gtk4
, pango
@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
buildFeatures = [ "gtk4_8" ];
nativeBuildInputs = [ pkg-config wrapGAppsHook];
nativeBuildInputs = [ pkg-config wrapGAppsHook4 ];
buildInputs = [ glib gtk4 pango librsvg ];
meta = with lib; {

View File

@ -1 +1,3 @@
{}
{
"kak-lsp": { "new": "kakoune-lsp", "date": "2024-04-01" }
}

View File

@ -1,11 +1,11 @@
{ lib, stdenv, fetchFromGitHub, fetchFromGitLab, fetchgit
, buildKakounePluginFrom2Nix
, kak-lsp, parinfer-rust, rep
, kakoune-lsp, parinfer-rust, rep
, fzf, git, guile, kakoune-unwrapped, lua5_3, plan9port
}:
self: super: {
inherit kak-lsp parinfer-rust rep;
inherit kakoune-lsp parinfer-rust rep;
case-kak = buildKakounePluginFrom2Nix {
pname = "case-kak";

View File

@ -3275,8 +3275,8 @@ let
publisher = "myriad-dreamin";
# Please update the corresponding binary (tinymist) when updating
# this extension.
version = "0.11.1";
hash = "sha256-jyZBnT8UW94TVnZKZna1cJa/UIj+DwYwlAbU4pnaf04=";
version = "0.11.3";
hash = "sha256-b5aD4gz4j+QAEPmYaNnaputbYTPoFxVFih76HmznUP8=";
};
nativeBuildInputs = [ jq moreutils ];

View File

@ -409,7 +409,7 @@
"owner": "libretro",
"repo": "mame",
"rev": "ac9d0347f5d331eb49017cd599a5e63a668b4f22",
"hash": "sha256-P5Hunw1o0C29/YsOu7tmR/oY2sbL2qTmY6RoJ56bTzI="
"hash": "sha256-YlnW5v8Slz/w/AHwWzJ7ZszFic/W0wth2nOZVOD7yxs="
},
"version": "unstable-2024-04-01"
},

View File

@ -69,9 +69,9 @@ in rec {
unstable = fetchurl rec {
# NOTE: Don't forget to change the hash for staging as well.
version = "9.5";
version = "9.6";
url = "https://dl.winehq.org/wine/source/9.x/wine-${version}.tar.xz";
hash = "sha256-Es8vtwmBNOI1HEnqO6j02ipnTx+HIr69TDpKbKbS6XU=";
hash = "sha256-Dglg7YK2AX6ILtozOLrRJwoRd7bPBfA6wfqxVavoIEg=";
inherit (stable) patches;
## see http://wiki.winehq.org/Gecko
@ -117,7 +117,7 @@ in rec {
staging = fetchFromGitLab rec {
# https://gitlab.winehq.org/wine/wine-staging
inherit (unstable) version;
hash = "sha256-Jxhtd/rG5x8wENO1dVUby/DjRLKPpPTYviowPQu2qK4=";
hash = "sha256-6AKN/KpmsTw9qxErhTTzqWuglgFdOAhtaoBlVRcs71Q=";
domain = "gitlab.winehq.org";
owner = "wine";
repo = "wine-staging";

View File

@ -3,7 +3,7 @@
, lib
, libadwaita
, python3Packages
, wrapGAppsHook
, wrapGAppsHook4
, meson
, ninja
, desktop-file-utils
@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec {
nativeBuildInputs = [
gobject-introspection
wrapGAppsHook
wrapGAppsHook4
desktop-file-utils
appstream-glib
meson

View File

@ -1,7 +1,7 @@
{ lib
, python3
, fetchFromGitHub
, wrapGAppsHook
, wrapGAppsHook4
, appstream-glib
, desktop-file-utils
, gettext
@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication rec {
};
nativeBuildInputs = [
wrapGAppsHook
wrapGAppsHook4
appstream-glib
desktop-file-utils
gettext

View File

@ -14,14 +14,14 @@
stdenv.mkDerivation rec {
pname = "drawio";
version = "24.0.4";
version = "24.1.0";
src = fetchFromGitHub {
owner = "jgraph";
repo = "drawio-desktop";
rev = "v${version}";
fetchSubmodules = true;
hash = "sha256-+TCnVXcmAEpa7MiL0dyeoh2aUfIIO8eze9pEaHgKnME=";
hash = "sha256-vwytqlPv8LfOceuBs/MNPxzO1ZYv1hwjIRyBh/wuVEU=";
};
# `@electron/fuses` tries to run `codesign` and fails. Disable and use autoSignDarwinBinariesHook instead
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
offlineCache = fetchYarnDeps {
yarnLock = src + "/yarn.lock";
hash = "sha256-QS0bkDDQq3sn79TQ+pTZsmbmXgMccyLmlPLTsko7eGg=";
hash = "sha256-mRnGsfxrdfzk6+z07174zZ7pcS68Zut6inuBPZkLtWQ=";
};
nativeBuildInputs = [

View File

@ -1,4 +1,4 @@
{ mkDerivation, lib, stdenv, fetchpatch, makeWrapper, fetchurl, cmake, extra-cmake-modules
{ mkDerivation, lib, stdenv, fetchpatch, fetchurl, cmake, extra-cmake-modules
, karchive, kconfig, kwidgetsaddons, kcompletion, kcoreaddons
, kguiaddons, ki18n, kitemmodels, kitemviews, kwindowsystem
, kio, kcrash, breeze-icons
@ -13,7 +13,7 @@
}:
mkDerivation rec {
pname = "krita";
pname = "krita-unwrapped";
inherit version;
src = fetchurl {
@ -36,7 +36,7 @@ mkDerivation rec {
})
];
nativeBuildInputs = [ cmake extra-cmake-modules pkg-config python3Packages.sip makeWrapper ];
nativeBuildInputs = [ cmake extra-cmake-modules pkg-config python3Packages.sip ];
buildInputs = [
karchive kconfig kwidgetsaddons kcompletion kcoreaddons kguiaddons
@ -72,14 +72,11 @@ mkDerivation rec {
"-DBUILD_KRITA_QT_DESIGNER_PLUGINS=ON"
];
preInstall = ''
qtWrapperArgs+=(--prefix PYTHONPATH : "$PYTHONPATH")
'';
meta = with lib; {
description = "A free and open source painting application";
homepage = "https://krita.org/";
maintainers = with maintainers; [ abbradar sifmelcara nek0 ];
mainProgram = "krita";
platforms = platforms.linux;
license = licenses.gpl3Only;
};

View File

@ -0,0 +1,27 @@
{ lib
, libsForQt5
, symlinkJoin
, unwrapped ? libsForQt5.callPackage ./. { }
, krita-plugin-gmic
, binaryPlugins ? [
# Default plugins provided by upstream appimage
krita-plugin-gmic
]
}:
symlinkJoin {
name = lib.replaceStrings [ "-unwrapped" ] [ "" ] unwrapped.name;
inherit (unwrapped) version buildInputs nativeBuildInputs meta;
paths = [ unwrapped ] ++ binaryPlugins;
postBuild = ''
wrapQtApp "$out/bin/krita" \
--prefix PYTHONPATH : "$PYTHONPATH" \
--set KRITA_PLUGIN_PATH "$out/lib/kritaplugins"
'';
passthru = {
inherit unwrapped binaryPlugins;
};
}

View File

@ -11,7 +11,7 @@
, pkg-config
, python3
, stdenv
, wrapGAppsHook
, wrapGAppsHook4
}:
stdenv.mkDerivation (finalAttrs: {
@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
meson
ninja
pkg-config
wrapGAppsHook
wrapGAppsHook4
];
buildInputs = [
@ -46,6 +46,8 @@ stdenv.mkDerivation (finalAttrs: {
];
postPatch = ''
substituteInPlace build-aux/meson/postinstall.py \
--replace-fail 'gtk-update-icon-cache' 'gtk4-update-icon-cache'
patchShebangs build-aux/meson/postinstall.py
'';

View File

@ -10,7 +10,7 @@
, ninja
, pkg-config
, rustc
, wrapGAppsHook
, wrapGAppsHook4
, python3
, git
, glib
@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
meson
ninja
pkg-config
wrapGAppsHook
wrapGAppsHook4
python3
git
desktop-file-utils

View File

@ -9,7 +9,7 @@
, gobject-introspection
, vulkan-tools
, python3
, wrapGAppsHook
, wrapGAppsHook4
, gdk-pixbuf
, lsb-release
, glxinfo
@ -35,7 +35,7 @@ python3.pkgs.buildPythonApplication rec {
meson
ninja
gobject-introspection
wrapGAppsHook
wrapGAppsHook4
];
buildInputs = [

View File

@ -15,16 +15,16 @@
rustPlatform.buildRustPackage rec {
pname = "inlyne";
version = "0.4.1";
version = "0.4.2";
src = fetchFromGitHub {
owner = "trimental";
repo = pname;
rev = "v${version}";
hash = "sha256-kZQREYnauR8xusyX6enBPUKHSe39aBLlrZjKEjJlfx0=";
hash = "sha256-Kae8WnahA/6k6QT5htYU2+diAFkmxVsbVaxRUlhf39o=";
};
cargoHash = "sha256-2mQFr2nLJ/iBLpdOUmerY6F2C8Kt+/vMEjS6THpmJic=";
cargoHash = "sha256-M6daK2y9HBRDV2wQjw87g1QYOqiJBfRf9uW1Eg6z6C8=";
nativeBuildInputs = [
installShellFiles

View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "johnny-reborn-engine";
version = "0.34";
version = "0.45";
src = fetchFromGitHub {
owner = "xesf";
repo = "jc_reborn";
rev = "v${version}";
hash = "sha256-JXaYSHpow7Pzy+ATEinET9ffvPIkOmlylnerZJnMUjY=";
hash = "sha256-PDh2RKdvm4LkDKi963CB5RiraWcS3FED6ug8T1J65GM=";
};
buildInputs = [ SDL2 ];

View File

@ -3,7 +3,7 @@
, python3Packages
, gobject-introspection
, libadwaita
, wrapGAppsHook
, wrapGAppsHook4
, lmmath
}:
@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec {
hash = "sha256-GjNpaorxkkhZsqrKq4kO5nqF5+4I4tmSc023AZpY8Sw=";
};
nativeBuildInputs = [ gobject-introspection wrapGAppsHook ];
nativeBuildInputs = [ gobject-introspection wrapGAppsHook4 ];
buildInputs = [ libadwaita ];
propagatedBuildInputs = with python3Packages; [

View File

@ -8,13 +8,13 @@ let config-module = "github.com/f1bonacc1/process-compose/src/config";
in
buildGoModule rec {
pname = "process-compose";
version = "1.0.1";
version = "1.2.0";
src = fetchFromGitHub {
owner = "F1bonacc1";
repo = pname;
rev = "v${version}";
hash = "sha256-wr0cIp+TRDiz8CmFA4lEGyOLNaiKUYysbAmLtvl4pb4=";
hash = "sha256-juFcVtHhqT6tw9YaKCDTUvX6NqqxEjqVK3Zom673IkQ=";
# populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true;

View File

@ -21,11 +21,11 @@
python3Packages.buildPythonApplication rec {
pname = "ulauncher";
version = "5.15.6";
version = "5.15.7";
src = fetchurl {
url = "https://github.com/Ulauncher/Ulauncher/releases/download/${version}/ulauncher_${version}.tar.gz";
sha256 = "sha256-WOWDekh9rcXeiN/ejiYC4BELhJwd98GkmyDOLN26ayU=";
sha256 = "sha256-YgOw3Gyy/o8qorWAnAlQrAZ2ZTnyP3PagLs2Qkdg788=";
};
nativeBuildInputs = with python3Packages; [

View File

@ -26,6 +26,14 @@ stdenv.mkDerivation rec {
hash = "sha256-9do7zL7yaZuqVjastySwjsByo5ja+KUP3590VjIyVnI=";
};
# Upstream patch needed to fix NULL deref
patches = [
(fetchpatch {
url = "https://git.sr.ht/~adnano/wmenu/commit/2856dddcac861ddf248143e66ba164d7aa05a0bb.patch";
hash = "sha256-P7SEjMssA8unNAlrgrTHm0uW5pefjpupPb4s/u2fTAM=";
})
];
nativeBuildInputs = [ pkg-config meson ninja ];
buildInputs = [ cairo pango wayland libxkbcommon wayland-protocols scdoc ];

View File

@ -1,15 +1,15 @@
{
"packageVersion": "124.0.1-1",
"packageVersion": "124.0.2-1",
"source": {
"rev": "124.0.1-1",
"sha256": "1qyhwxc16qsmq3bvsmdwqib47v27fly1szq7jh78dylpib8xgb6f"
"rev": "124.0.2-1",
"sha256": "0qh40l1pif0b6n1amiw18pr13gvmi7rjd89q6n1qz8y14yf9w5xp"
},
"settings": {
"rev": "8a499ecdab8a5136faee50aae1fdd48997711de6",
"sha256": "1c12y7b09rrz8zlpar8nnd9k2nvldjqq3cicbc57g6s1npnf8rz6"
},
"firefox": {
"version": "124.0.1",
"sha512": "282c45e5c468419536dd8b81c8ea687b10d8002d7521403330e6eeef49207143bee88a44c3785748d461ed9a72687606f5da14f4dfb98eb40a5cd08a4a12722b"
"version": "124.0.2",
"sha512": "8cf340de6e34812f8ae3363265859a263330af770d981c3dd1ca1e7e0cfe513604d3e68184d4aa1446569aefbdf359d561fbc200faf19a5ed020a1709d9ef10e"
}
}

View File

@ -2,17 +2,17 @@
buildGoModule rec {
pname = "argocd";
version = "2.10.5";
version = "2.10.6";
src = fetchFromGitHub {
owner = "argoproj";
repo = "argo-cd";
rev = "v${version}";
hash = "sha256-koTNC6ClKgmrgrELxtGz4rKe/VV/9kPK99Cmm50aB94=";
hash = "sha256-tKZQVI2WiqsPIMHCBGJHcZYk4gOoshiGA0WPyeoxvok=";
};
proxyVendor = true; # darwin/linux hash mismatch
vendorHash = "sha256-BqXTjmeKfCCwdwJ3gSOyvKfuqkjN+0S/1xe5vM406Ig=";
vendorHash = "sha256-dgj8IXrLNZ6ZEIFAY/gXAklVKfLXosRuR1SyZWkwrwA=";
# Set target as ./cmd per cli-local
# https://github.com/argoproj/argo-cd/blob/master/Makefile#L227

View File

@ -1,7 +1,7 @@
GEM
remote: https://rubygems.org/
specs:
activesupport (7.1.3)
activesupport (7.1.3.2)
base64
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
@ -14,21 +14,20 @@ GEM
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
base64 (0.2.0)
bigdecimal (3.1.6)
bigdecimal (3.1.7)
colorize (0.8.1)
concurrent-ruby (1.2.3)
connection_pool (2.4.1)
domain_name (0.6.20240107)
drb (2.2.0)
ruby2_keywords
drb (2.2.1)
ejson (1.4.1)
faraday (2.9.0)
faraday-net_http (>= 2.0, < 3.2)
faraday-net_http (3.1.0)
net-http
ffi (1.16.3)
ffi-compiler (1.0.1)
ffi (>= 1.0.0)
ffi-compiler (1.3.2)
ffi (>= 1.15.5)
rake
google-cloud-env (2.1.1)
faraday (>= 1.0, < 3.a)
@ -49,12 +48,13 @@ GEM
http-cookie (1.0.5)
domain_name (~> 0.5)
http-form_data (2.3.0)
i18n (1.14.1)
i18n (1.14.4)
concurrent-ruby (~> 1.0)
jsonpath (1.1.5)
multi_json
jwt (2.7.1)
krane (3.5.0)
jwt (2.8.1)
base64
krane (3.5.1)
activesupport (>= 5.0)
colorize (~> 0.8)
concurrent-ruby (~> 1.1)
@ -75,30 +75,29 @@ GEM
rake (~> 13.0)
mime-types (3.5.2)
mime-types-data (~> 3.2015)
mime-types-data (3.2024.0206)
minitest (5.22.2)
mime-types-data (3.2024.0305)
minitest (5.22.3)
multi_json (1.15.0)
mutex_m (0.2.0)
net-http (0.4.1)
uri
netrc (0.11.0)
os (1.1.4)
public_suffix (5.0.4)
rake (13.1.0)
public_suffix (5.0.5)
rake (13.2.0)
recursive-open-struct (1.1.3)
rest-client (2.1.0)
http-accept (>= 1.7.0, < 2.0)
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 4.0)
netrc (~> 0.8)
ruby2_keywords (0.0.5)
signet (0.19.0)
addressable (~> 2.8)
faraday (>= 0.17.5, < 3.a)
jwt (>= 1.5, < 3.0)
multi_json (~> 1.10)
statsd-instrument (3.6.1)
thor (1.3.0)
statsd-instrument (3.7.0)
thor (1.3.1)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
uri (0.13.0)
@ -110,4 +109,4 @@ DEPENDENCIES
krane
BUNDLED WITH
2.5.5
2.5.6

View File

@ -5,10 +5,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "09zrw3sydkk6lwzjhzia38wg1as5aab2lgnysfdr1qxh39zi7z7v";
sha256 = "0blbbf2x7dn7ar4g9aij403582zb6zscbj48bz63lvaamsvlb15d";
type = "gem";
};
version = "7.1.3";
version = "7.1.3.2";
};
addressable = {
dependencies = ["public_suffix"];
@ -36,10 +36,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "00db5v09k1z3539g1zrk7vkjrln9967k08adh6qx33ng97a2gg5w";
sha256 = "0cq1c29zbkcxgdihqisirhcw76xc768z2zpd5vbccpq0l1lv76g7";
type = "gem";
};
version = "3.1.6";
version = "3.1.7";
};
colorize = {
groups = ["default"];
@ -82,15 +82,14 @@
version = "0.6.20240107";
};
drb = {
dependencies = ["ruby2_keywords"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "03ylflxbp9jrs1hx3d4wvx05yb9hdq4a0r706zz6qc6kvqfazr79";
sha256 = "0h5kbj9hvg5hb3c7l425zpds0vb42phvln2knab8nmazg2zp5m79";
type = "gem";
};
version = "2.2.0";
version = "2.2.1";
};
ejson = {
groups = ["default"];
@ -140,10 +139,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0c2caqm9wqnbidcb8dj4wd3s902z15qmgxplwyfyqbwa0ydki7q1";
sha256 = "1844j58cdg2q6g0rqfwg4rrambnhf059h4yg9rfmrbrcs60kskx9";
type = "gem";
};
version = "1.0.1";
version = "1.3.2";
};
google-cloud-env = {
dependencies = ["faraday"];
@ -215,10 +214,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0qaamqsh5f3szhcakkak8ikxlzxqnv49n2p7504hcz2l0f4nj0wx";
sha256 = "0lbm33fpb3w06wd2231sg58dwlwgjsvym93m548ajvl6s3mfvpn7";
type = "gem";
};
version = "1.14.1";
version = "1.14.4";
};
jsonpath = {
dependencies = ["multi_json"];
@ -232,14 +231,15 @@
version = "1.1.5";
};
jwt = {
dependencies = ["base64"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "16z11alz13vfc4zs5l3fk6n51n2jw9lskvc4h4prnww0y797qd87";
sha256 = "02m3vza49pb9dirwpn8vmzbcypi3fc6l3a9dh253jwm1121g7ajb";
type = "gem";
};
version = "2.7.1";
version = "2.8.1";
};
krane = {
dependencies = ["activesupport" "colorize" "concurrent-ruby" "ejson" "googleauth" "jsonpath" "kubeclient" "multi_json" "statsd-instrument" "thor"];
@ -247,10 +247,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1j4vrb55akvpg08vfwvfawf9qbjv9dyiw32g57va89yq371qjasp";
sha256 = "1wnx86ars7csb2sxn69rb654p5xpz6xlygkx4mbyw1abgzyr2ap0";
type = "gem";
};
version = "3.5.0";
version = "3.5.1";
};
kubeclient = {
dependencies = ["http" "jsonpath" "recursive-open-struct" "rest-client"];
@ -290,20 +290,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0zpn5brxdf5akh7ij511bkrd30fxd7697shmxxszahqj9m62zvn5";
sha256 = "00x7w5xqsj9m33v3vkmy23wipkkysafksib53ypzn27p5g81w455";
type = "gem";
};
version = "3.2024.0206";
version = "3.2024.0305";
};
minitest = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0667vf0zglacry87nkcl3ns8421aydvz71vfa3g3yjhiq8zh19f5";
sha256 = "07lq26b86giy3ha3fhrywk9r1ajhc2pm2mzj657jnpnbj1i6g17a";
type = "gem";
};
version = "5.22.2";
version = "5.22.3";
};
multi_json = {
groups = ["default"];
@ -361,20 +361,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1bni4qjrsh2q49pnmmd6if4iv3ak36bd2cckrs6npl111n769k9m";
sha256 = "14y4vzjwf5gp0mqgs880kis0k7n2biq8i6ci6q2n315kichl1hvj";
type = "gem";
};
version = "5.0.4";
version = "5.0.5";
};
rake = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ilr853hawi09626axx0mps4rkkmxcs54mapz9jnqvpnlwd3wsmy";
sha256 = "0lwv4rniry7k9dvz1n462d7j0dq9mrl6a95y6cvs6139h0ksxhgn";
type = "gem";
};
version = "13.1.0";
version = "13.2.0";
};
recursive-open-struct = {
groups = ["default"];
@ -397,16 +397,6 @@
};
version = "2.1.0";
};
ruby2_keywords = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz";
type = "gem";
};
version = "0.0.5";
};
signet = {
dependencies = ["addressable" "faraday" "jwt" "multi_json"];
groups = ["default"];
@ -423,20 +413,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1psmiygzad3j4l0vzh2x48cmk4v6q87yg8ndvnp9jkcsbik77bzx";
sha256 = "14blk2vvcmr0xycd3bzlr36nz5wn7m7ana2mljfm4zxgwx5vj7h7";
type = "gem";
};
version = "3.6.1";
version = "3.7.0";
};
thor = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1hx77jxkrwi66yvs10wfxqa8s25ds25ywgrrf66acm9nbfg7zp0s";
sha256 = "1vq1fjp45az9hfp6fxljhdrkv75cvbab1jfrwcw738pnsiqk8zps";
type = "gem";
};
version = "1.3.0";
version = "1.3.1";
};
tzinfo = {
dependencies = ["concurrent-ruby"];

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "krelay";
version = "0.0.9";
version = "0.0.10";
src = fetchFromGitHub {
owner = "knight42";
repo = pname;
rev = "v${version}";
hash = "sha256-8UMbSsZzk9GPQR+d8ybqRQa1ouL6h8nzk/O7j0jJyk4=";
hash = "sha256-1sAkNueP8qGwPwdX0oSJfB/oGvna6+G8Cay+3vGJ2IE=";
};
vendorHash = "sha256-vaWdJyPOLsrLrhipBvUCOHo/TjnJz4Qpvj3lvUPHomU=";
vendorHash = "sha256-iv0OJLhIZpdem2/JFirJnvmU44ylTomgB8UqCGqHbwA=";
subPackages = [ "cmd/client" ];

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "ocm";
version = "0.1.70";
version = "0.1.73";
src = fetchFromGitHub {
owner = "openshift-online";
repo = "ocm-cli";
rev = "v${version}";
sha256 = "sha256-J/CN1cxEcKiEt8WMg79nA4y0gp18vSDEsBqvYuQVaIk=";
sha256 = "sha256-hcbCUzC+E7VHmqATw/1LQxdMLiFibgYiWrQHpm3jZLA=";
};
vendorHash = "sha256-3HLTuWf4mK3r92s2mPE2yl/rrPxgcsB9EmrxkiJsMaE=";
vendorHash = "sha256-NP5LLP27hn8p2gUVO/qpdu1Yp3t8iarUUKR/FjU0Qlc=";
# Strip the final binary.
ldflags = [ "-s" "-w" ];

View File

@ -5,14 +5,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "terraform-compliance";
version = "1.3.47";
version = "1.3.48";
format = "setuptools";
src = fetchFromGitHub {
owner = "terraform-compliance";
repo = "cli";
rev = "refs/tags/${version}";
sha256 = "sha256-QJDKBM5CTOdF7oT42vL+Yp1UsQXWvkSZzo+WSsDxAZw=";
sha256 = "sha256-2nf/EJcC4KYTBItByX47UqTSs2EOgsUAgRbLEdB4Iyg=";
};
postPatch = ''

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "deck";
version = "1.36.0";
version = "1.36.1";
src = fetchFromGitHub {
owner = "Kong";
repo = "deck";
rev = "v${version}";
hash = "sha256-bbHJilMh7qnGvYuid8/PmIg5m42jddqOOuMd7mzQmCo=";
hash = "sha256-9wPwqiQBVVGCRVarAAWk9QjkbJBgCAKY16MjqT8ZBI4=";
};
nativeBuildInputs = [ installShellFiles ];
@ -21,7 +21,7 @@ buildGoModule rec {
];
proxyVendor = true; # darwin/linux hash mismatch
vendorHash = "sha256-Er9m8G020SKEN8jMIhEYiKvF27YY4dZvG0noYaH3bPU=";
vendorHash = "sha256-WNyDHFdqUREATvJW+akhLB1HQIXMZshn48FEw/OkfV0=";
postInstall = ''
installShellCompletion --cmd deck \

View File

@ -8,7 +8,7 @@
, gettext
, desktop-file-utils
, appstream-glib
, wrapGAppsHook
, wrapGAppsHook4
, python3
# Not native
, gst_all_1
@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
gettext
desktop-file-utils
appstream-glib
wrapGAppsHook
wrapGAppsHook4
python3
];

View File

@ -11,11 +11,11 @@
}:
let
pname = "beeper";
version = "3.102.10";
version = "3.102.14";
name = "${pname}-${version}";
src = fetchurl {
url = "https://download.todesktop.com/2003241lzgn20jd/beeper-3.102.10-build-2403272qaonqz6e-x86_64.AppImage";
hash = "sha256-rI9gUfFX5nffSawTKPII/gXE+FkzGDE18/ByGiJu8CU=";
url = "https://download.todesktop.com/2003241lzgn20jd/beeper-3.102.14-build-24040616ytycz8q-x86_64.AppImage";
hash = "sha256-A+0dXAddZq7GWMyi9v1g0B9f7b6COMkFlm8bX4XXvzU=";
};
appimage = appimageTools.wrapType2 {
inherit version pname src;

View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub
, buildPackages
, vala, cmake, ninja, wrapGAppsHook, pkg-config, gettext
, vala, cmake, ninja, wrapGAppsHook4, pkg-config, gettext
, gobject-introspection, glib, gdk-pixbuf, gtk4, glib-networking
, libadwaita
, libnotify, libsoup, libgee
@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
cmake
ninja # https://github.com/dino/dino/issues/230
pkg-config
wrapGAppsHook
wrapGAppsHook4
gettext
gobject-introspection
];

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "signalbackup-tools";
version = "20240328-1";
version = "20240406";
src = fetchFromGitHub {
owner = "bepaald";
repo = pname;
rev = version;
hash = "sha256-oEwWbTs8Orpo+qRCKVvkeJYEob8O/qkKmv/iA5JUpfQ=";
hash = "sha256-Yc6QlEtN73zy3onckxC80QOmSrW5MPn4+rnWE7WEPug=";
};
postPatch = ''

View File

@ -20,7 +20,7 @@
, python3
, webkitgtk_6_0
, blueprint-compiler
, wrapGAppsHook
, wrapGAppsHook4
}:
stdenv.mkDerivation rec {
@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
pkg-config
python3
blueprint-compiler
wrapGAppsHook
wrapGAppsHook4
];
buildInputs = [

View File

@ -63,14 +63,14 @@ let
in
stdenv.mkDerivation rec {
pname = "telegram-desktop";
version = "4.16.1";
version = "4.16.4";
src = fetchFromGitHub {
owner = "telegramdesktop";
repo = "tdesktop";
rev = "v${version}";
fetchSubmodules = true;
hash = "sha256-sb7BpEIjSJS4ntv8s0RSJAj4BhTgHF7fEei5QXl60mA=";
hash = "sha256-WBLDsUUEbyn6/NqdbfaUKhoH0T/c9k6lKCy23WPRuqk=";
};
patches = [

View File

@ -36,14 +36,14 @@ let
in
assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins;
stdenv.mkDerivation rec {
version = "4.2.1";
version = "4.2.2";
pname = "weechat";
hardeningEnable = [ "pie" ];
src = fetchurl {
url = "https://weechat.org/files/src/weechat-${version}.tar.xz";
hash = "sha256-JT3fCG9shFAxot0pSxVShR1rBMwIovnaSu37Pi+Rvc0=";
hash = "sha256-IJaLIsfw9Q35z2/4WY3RvQF8V1myyUWT9dnteyTruUE=";
};
# Why is this needed? https://github.com/weechat/weechat/issues/2031

View File

@ -8,31 +8,33 @@
, go
, wrapQtAppsHook
, qtbase
, qtquickcontrols2
, qtdeclarative
, qtsvg
, kconfig
, kcoreaddons
, kguiaddons
, ki18n
, kirigami2
, kirigami
, kirigami-addons
, knotifications
, nlohmann_json
}:
let
version = "0.9.0";
version = "0.16.0";
src = fetchFromGitHub {
owner = "f-koehler";
repo = "KTailctl";
rev = "v${version}";
hash = "sha256-nY6DEHkDVWIlvc64smXb9KshrhNgNLKiilYydbMKCqc=";
hash = "sha256-fIx6XfNGK+jDpeaoCzTKwv3J01yWoHOgWxjbwTGVK1U=";
};
goDeps = (buildGoModule {
pname = "tailwrap";
inherit src version;
modRoot = "tailwrap";
vendorHash = "sha256-Y9xhoTf3vCtiNi5qOPg020EQmASo58BZI3rAoUEC8qE=";
vendorHash = "sha256-egTzSdOKrhdEBKarIfROxZUsxbnR9F1JDbdoKzGf9UM=";
}).goModules;
in
stdenv.mkDerivation {
@ -63,14 +65,15 @@ stdenv.mkDerivation {
buildInputs = [
qtbase
qtquickcontrols2
qtdeclarative
qtsvg
kconfig
kcoreaddons
kguiaddons
ki18n
kirigami2
kirigami-addons
kirigami
knotifications
nlohmann_json
];
meta = with lib; {

View File

@ -13,16 +13,16 @@ let
common = { stname, target, postInstall ? "" }:
buildGoModule rec {
pname = stname;
version = "1.27.4";
version = "1.27.5";
src = fetchFromGitHub {
owner = "syncthing";
repo = "syncthing";
rev = "v${version}";
hash = "sha256-TXkZJAN72Qa3Mo2TYvCHNOl3BWfRxu78XXHW48Jjj0M=";
hash = "sha256-Fcsa6xE0i1iXFZ76L57OKKxDJ9stw6WnJL3PQOTr/QQ=";
};
vendorHash = "sha256-ALdmETpEmvA3bTfBRK6LaO7bnlH03fljX1P7rqzskG4=";
vendorHash = "sha256-CSI2Mnu3Da99cNE2s6HadTyxFVIbhXLOy3aykij1GLo=";
nativeBuildInputs = lib.optionals stdenv.isDarwin [
# Recent versions of macOS seem to require binaries to be signed when

View File

@ -22,13 +22,13 @@
}:
let
version = "2.6.3";
version = "2.7.1";
src = fetchFromGitHub {
owner = "paperless-ngx";
repo = "paperless-ngx";
rev = "refs/tags/v${version}";
hash = "sha256-M1CnB1adk02lJuFsm0zzjSx/l9hKHJMt1Wh2a5Xtdyg=";
hash = "sha256-k19dQeXuPwggTfrsxL4oesExAz4tkT/GN6lt7sLU3Nk=";
};
python = python3;
@ -53,7 +53,7 @@ let
cd src-ui
'';
npmDepsHash = "sha256-qgCUfGVk698Ink23U7LxkGdFoNpOhCp240tbk+hU0dk=";
npmDepsHash = "sha256-MJ5pnQChghZBfVN6Lbz6VcMtbe8QadiFLTsMF5TlebQ=";
nativeBuildInputs = [
pkg-config

View File

@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
'';
homepage = "https://strlen.com/treesheets/";
maintainers = with maintainers; [ obadz avery ];
maintainers = with maintainers; [ obadz ];
platforms = platforms.unix;
license = licenses.zlib;
};

View File

@ -1,12 +1,12 @@
{ lib, stdenv, fetchurl, cmake, expat, openssl, zlib, lmdb, curl, wxGTK32, wrapGAppsHook }:
{ lib, stdenv, fetchurl, cmake, expat, openssl, zlib, lmdb, curl, sqlite, wxGTK32, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "tqsl";
version = "2.6.5";
version = "2.7.2";
src = fetchurl {
url = "https://www.arrl.org/files/file/LoTW%20Instructions/${pname}-${version}.tar.gz";
sha256 = "sha256-UGPMp1mAarHWuLbZu2wWpjgCdf8ZKj0Mwkqp32U5/8w=";
sha256 = "sha256-T4NBCUTYHT6ugSg1gSfjQBOBndqwSwyWLr/qlDPQGKI=";
};
nativeBuildInputs = [ cmake wrapGAppsHook ];
@ -16,6 +16,7 @@ stdenv.mkDerivation rec {
zlib
lmdb
curl
sqlite
wxGTK32
];

View File

@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "nvc";
version = "1.11.3";
version = "1.12.0";
src = fetchFromGitHub {
owner = "nickg";
repo = "nvc";
rev = "r${version}";
hash = "sha256-Z4YxXPf8uKlASSK9v6fbtHtkUibc9EeA4i+3kD/vBmY=";
hash = "sha256-7g4Ki5lhmX/13XCv0on1PgvEthCTfe9wh8EFjMcP1+c=";
};
nativeBuildInputs = [

View File

@ -18,9 +18,8 @@
, libgee
, callPackage
, python3
, gtk3
, desktop-file-utils
, wrapGAppsHook
, wrapGAppsHook4
, sixelSupport ? false
}:
@ -48,6 +47,8 @@ stdenv.mkDerivation rec {
];
postPatch = ''
substituteInPlace build-aux/meson/postinstall.py \
--replace-fail 'gtk-update-icon-cache' 'gtk4-update-icon-cache'
patchShebangs build-aux/meson/postinstall.py
'';
@ -57,9 +58,8 @@ stdenv.mkDerivation rec {
pkg-config
vala
sassc
wrapGAppsHook
wrapGAppsHook4
python3
gtk3 # For gtk-update-icon-cache
desktop-file-utils # For update-desktop-database
];
buildInputs = [

View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "glitter";
version = "1.6.5";
version = "1.6.6";
src = fetchFromGitHub {
owner = "milo123459";
repo = pname;
rev = "v${version}";
sha256 = "sha256-sMAHVXpgAhZYUpl75JRtKhTqt/sQkSkoEzk7aGV1vcQ=";
hash = "sha256-dImQLC7owPf2EB5COO5vjN3a6k7gJ88D2hMSUW2/wn4=";
};
cargoSha256 = "sha256-CaWpGNP7Jsv/3dks0LVbZXoD/9HqJmOzaD0ejT5xSqA=";
cargoHash = "sha256-7JQcY3HCG3UQ0Mfz/+ZZ0axGEpQoH410FT72tjHW7EE=";
nativeCheckInputs = [
git

View File

@ -62,13 +62,13 @@ in
stdenv.mkDerivation (finalAttrs: {
pname = "obs-studio";
version = "30.1.1";
version = "30.1.2";
src = fetchFromGitHub {
owner = "obsproject";
repo = finalAttrs.pname;
rev = finalAttrs.version;
sha256 = "sha256-1/8SsDAEBT8jEXKKQgA9JjUHM4/8UtcELUGFiHBB31g=";
sha256 = "sha256-M4IINBoYrgkM37ykb4boHyWP8AxwMX0b7IAeeNIw9Qo=";
fetchSubmodules = true;
};

View File

@ -11,13 +11,13 @@
buildGoModule rec {
pname = "containerd";
version = "1.7.14";
version = "1.7.15";
src = fetchFromGitHub {
owner = "containerd";
repo = "containerd";
rev = "v${version}";
hash = "sha256-okTz2UCF5LxOdtLDBy1pN2to6WHi+I0jtR67sn7Qrbk=";
hash = "sha256-qLrPLGxsUmgEscrhyl+1rJ0k7c9ibKnpMpsJPD4xDZU=";
};
vendorHash = null;

View File

@ -7,16 +7,16 @@
buildGoModule rec {
pname = "kraftkit";
version = "0.8.1";
version = "0.8.2";
src = fetchFromGitHub {
owner = "unikraft";
repo = "kraftkit";
rev = "v${version}";
hash = "sha256-XbA1nyiHG8aTXXcJ4puAMutLXrjgus1fdI0Rv+YHh7k=";
hash = "sha256-IGOD4AItfiGrVRwoPV4rAzhTUbyHvm3LMpMDjWgXh6g=";
};
vendorHash = "sha256-PnFBBRF5RH908wPAKQjyY4DiKYUq31uxNb9qYMwiybs=";
vendorHash = "sha256-0i2HUQ/+Ql1ma7bX7DVC0Pw78CR7gUvnGYFWGB1wt7s=";
ldflags = [
"-s"

View File

@ -5,7 +5,7 @@
, meson
, ninja
, pkg-config
, wrapGAppsHook
, wrapGAppsHook4
, desktop-file-utils
, feedbackd
, gtk4
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
ninja
phosh
pkg-config
wrapGAppsHook
wrapGAppsHook4
];
buildInputs = [

View File

@ -0,0 +1,35 @@
{ lib
, python3
, fetchFromGitLab
}:
python3.pkgs.buildPythonApplication rec {
pname = "annextimelog";
version = "0.13.1";
format = "pyproject";
src = fetchFromGitLab {
owner = "nobodyinperson";
repo = "annextimelog";
rev = "v${version}";
hash = "sha256-VgeILw8WfqVrmsU/kBw+jHTOt2a6sVT7YgP2pKRp2AY=";
};
nativeBuildInputs = with python3.pkgs; [
setuptools
wheel
poetry-core
];
propagatedBuildInputs = with python3.pkgs; [
rich
];
meta = with lib; {
description = "Git Annex-backed Time Tracking";
homepage = "https://gitlab.com/nobodyinperson/annextimelog";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ matthiasbeyer ];
};
}

View File

@ -1,5 +1,6 @@
{ appstream-glib
, cargo
, dbus
, desktop-file-utils
, fetchFromGitLab
, git
@ -16,7 +17,7 @@
, rustPlatform
, rustc
, stdenv
, wrapGAppsHook
, wrapGAppsHook4
}:
stdenv.mkDerivation (finalAttrs: {
pname = "audio-sharing";
@ -46,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
pkg-config
python3
rustc
wrapGAppsHook
wrapGAppsHook4
] ++ (with rustPlatform; [
cargoSetupHook
]);
@ -59,6 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
gst_all_1.gstreamer
gtk4
libadwaita
dbus
];
passthru = {

View File

@ -6,16 +6,16 @@
buildGoModule rec {
pname = "bluetuith";
version = "0.2.1";
version = "0.2.2";
src = fetchFromGitHub {
owner = "darkhz";
repo = pname;
rev = "v${version}";
sha256 = "sha256-KeIhul6xeak2UR+MadKC2j1uHiPwdsh5bjGr1uvOL/4=";
sha256 = "sha256-JwPTFMimGDZnESx6l72cK545rzyDWWTBU66t9bU49w0=";
};
vendorHash = "sha256-XthLmfHmkTsI4l5Sz5P1qeuxamVTLX7i+Wf73n7iv1M=";
vendorHash = "sha256-A0hUenuji3bfJghLRM2mvFbusrHm+tQ+LeRGzIETpbs=";
CGO_ENABLED = 0;

View File

@ -0,0 +1,35 @@
{ lib, fetchFromGitHub, rustPlatform }:
rustPlatform.buildRustPackage rec {
pname = "buckle";
version = "1.1.0";
cargoHash = "sha256-O90/Xo9WjLVGFEkh6S6IyvanceRBJHneEret6W8e5Yc=";
src = fetchFromGitHub {
owner = "benbrittain";
repo = "buckle";
rev = "v${version}";
sha256 = "sha256-eWhcDzw+6I5N0dse5avwhcQ/y6YZ6b3QKyBwWBrA/xo=";
};
checkFlags = [
# Both tests access the network.
"--skip=test_buck2_latest"
"--skip=test_buck2_specific_version"
];
meta = with lib; {
description = "A buck2 launcher";
longDescription = ''
Buckle is a launcher for [Buck2](https://buck2.build). It manages
Buck2 on a per-project basis. This enables a project or team to do
seamless upgrades of their build system tooling. It is designed to
be minimally intrusive. Buckle only manages fetching Buck2 and
enforcing the prelude is upgraded in sync.
'';
homepage = "https://github.com/benbrittain/buckle";
license = licenses.mit;
maintainers = with maintainers; [ cbarrete ];
mainProgram = "buckle";
};
}

View File

@ -0,0 +1,25 @@
{ lib, rustPlatform, fetchFromGitHub }:
rustPlatform.buildRustPackage rec {
pname = "cargo-autoinherit";
version = "0.1.4";
src = fetchFromGitHub {
owner = "mainmatter";
repo = "cargo-autoinherit";
rev = "v${version}";
hash = "sha256-BuZDCd4SwSYg5eKV61L3RpPVmq5NZDAOc9zOz5QiSNI=";
};
cargoHash = "sha256-9hhrVkC1xB2E/vatkiM4PIJyXq+0GDoqlgXZXc8WehU=";
meta = with lib; {
description = "Automatically DRY up your Rust dependencies";
homepage = "https://github.com/mainmatter/cargo-autoinherit";
license = with licenses; [ asl20 /* OR */ mit ];
platforms = platforms.unix;
maintainers = with maintainers; [ matthiasbeyer ];
mainProgram = "cargo-autoinherit";
};
}

View File

@ -13,10 +13,10 @@ let
}.${system} or throwSystem;
hash = {
x86_64-linux = "sha256-9r3v5xCYYoxfs3zY7/v8K3B5CxJPcNcEtkDU6kuvzGE=";
aarch64-linux = "sha256-Q/PktmEfTBX1ycK/7ebsJSE25FQ8dO+ejv+fAOKlNy8=";
x86_64-darwin = "sha256-vyv5oyMl9Itu434okNmgRX0A1UTX3ZxJ3Q56akpIbrU=";
aarch64-darwin = "sha256-H2ghAfRzDhbCyxrKmJ2ritkUuDeWZzINr8DROzbOyUQ=";
x86_64-linux = "sha256-AHjR6lHszYqZ2yC/uY2DmB67xMUFZliqI29Ptes2SoY=";
aarch64-linux = "sha256-2NYlec6gpVMJwZctEqwn5rQiTrb5PmaxEz3lQxF1qmk=";
x86_64-darwin = "sha256-OeMbO2lDK6XUF3ht+09ZWOL7UsEEVTrKyXOfhny8DhM=";
aarch64-darwin = "sha256-4CQvJkd3kI7XJz46QsSUBtWLmxDu7AcAJwRS3amv0SM=";
}.${system} or throwSystem;
bin = "$out/bin/codeium_language_server";
@ -24,7 +24,7 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "codeium";
version = "1.8.16";
version = "1.8.22";
src = fetchurl {
name = "${finalAttrs.pname}-${finalAttrs.version}.gz";
url = "https://github.com/Exafunction/codeium/releases/download/language-server-v${finalAttrs.version}/language_server_${plat}.gz";

View File

@ -9,13 +9,13 @@
buildGoModule rec {
pname = "cue";
version = "0.8.0";
version = "0.8.1";
src = fetchFromGitHub {
owner = "cue-lang";
repo = "cue";
rev = "v${version}";
hash = "sha256-7gn8/35rpbyzSP4ZM21ig6Wsq5Tp18x1Ex/IVb2iE7k=";
hash = "sha256-0HNE7NzTdq1bXj9tBZvBQ3m6Q5iuyAMKMOz0kyOJi7w=";
};
vendorHash = "sha256-0OZtKIDdEnQLnSj109EpGvaZvMIy7gPAZ+weHzYKGSg=";

View File

@ -1,13 +1,26 @@
{ lib
, ocamlPackages
, stdenv
, overrideSDK
, fetchFromGitHub
, python3
, dune_3
, makeWrapper
, pandoc
, poppler_utils
, testers
, docfd
}:
ocamlPackages.buildDunePackage rec {
let
# Needed for x86_64-darwin
buildDunePackage' = ocamlPackages.buildDunePackage.override {
stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv;
};
in
buildDunePackage' rec {
pname = "docfd";
version = "3.0.0";
version = "4.0.0";
minimalOCamlVersion = "5.1";
@ -15,10 +28,10 @@ ocamlPackages.buildDunePackage rec {
owner = "darrenldl";
repo = "docfd";
rev = version;
hash = "sha256-pJ5LlOfC+9NRfY7ng9LAxEnjr+mtJmhRNTo9Im6Lkbo=";
hash = "sha256-fgwUXRZ6k5i3XLxXpjbrl0TJZMT+NkGXf7KNwRgi+q8=";
};
nativeBuildInputs = [ python3 dune_3 ];
nativeBuildInputs = [ python3 dune_3 makeWrapper ];
buildInputs = with ocamlPackages; [
cmdliner
containers-data
@ -35,17 +48,21 @@ ocamlPackages.buildDunePackage rec {
yojson
];
postInstall = ''
wrapProgram $out/bin/docfd --prefix PATH : "${lib.makeBinPath [ pandoc poppler_utils ]}"
'';
passthru.tests.version = testers.testVersion {
package = docfd;
};
meta = with lib; {
description = "TUI multiline fuzzy document finder";
longDescription = ''
Think interactive grep for both text and other document files, but
word/token based instead of regex and line based, so you can search
across lines easily. Aims to provide good UX via integration with
common text editors and other file viewers.
Optional dependencies:
fzf - for fuzzy file picker with "docfd ?".
poppler_utils - for pdf search.
pandoc - for .epub, .odt, .docx, .fb2, .ipynb, .html, & .htm files.
Think interactive grep for text and other document files.
Word/token based instead of regex and line based, so you
can search across lines easily. Aims to provide good UX via
integration with common text editors and other file viewers.
'';
homepage = "https://github.com/darrenldl/docfd";
license = licenses.mit;

View File

@ -3,7 +3,7 @@
, python3Packages
, gobject-introspection
, libadwaita
, wrapGAppsHook
, wrapGAppsHook4
, meson
, ninja
, desktop-file-utils
@ -29,7 +29,7 @@ python3Packages.buildPythonApplication rec {
nativeBuildInputs = [
gobject-introspection
wrapGAppsHook
wrapGAppsHook4
desktop-file-utils
meson
ninja

View File

@ -18,10 +18,9 @@ symlinkJoin {
];
postBuild = ''
rm -rf $out/bin/*
makeWrapper ${etlegacy-unwrapped}/bin/etl.* $out/bin/etl \
makeWrapper $out/bin/etl.* $out/bin/etl \
--add-flags "+set fs_basepath ${placeholder "out"}/lib/etlegacy"
makeWrapper ${etlegacy-unwrapped}/bin/etlded.* $out/bin/etlded \
makeWrapper $out/bin/etlded.* $out/bin/etlded \
--add-flags "+set fs_basepath ${placeholder "out"}/lib/etlegacy"
'';

View File

@ -8,7 +8,7 @@
, libfido2
, libnotify
, python3
, wrapGAppsHook
, wrapGAppsHook4
}:
buildGoModule rec {
@ -55,7 +55,7 @@ buildGoModule rec {
nativeBuildInputs = [
gobject-introspection
python3.pkgs.wrapPython
wrapGAppsHook
wrapGAppsHook4
];
buildInputs = [

View File

@ -0,0 +1,71 @@
{ lib
, fetchFromGitHub
, rustPlatform
, pkg-config
, fontconfig
, libGL
, libX11
, libXcursor
, libXi
, libXrandr
, cmake
, libxkbcommon
, wayland
, makeWrapper
}:
rustPlatform.buildRustPackage rec {
pname = "gpustat";
version = "0.1.5";
src = fetchFromGitHub {
owner = "arduano";
repo = "gpustat";
rev = "v${version}";
sha256 = "sha256-M9P/qfw/tp9ogkNOE3b2fD2rGFnii1/VwmqJHqXb7Mg=";
};
cargoSha256 = "sha256-po/pEMZEtySZnz7l2FI7Wqbmp2CiWBijchKGkqlIMPU=";
nativeBuildInputs = [
cmake
makeWrapper
pkg-config
];
buildInputs = [
fontconfig
libGL
libX11
libXcursor
libXi
libXrandr
libxkbcommon
wayland
];
postInstall = ''
mkdir -p $out/share/applications $out/share/pixmaps
cp assets/gpustat.desktop $out/share/applications
cp assets/gpustat_icon_* $out/share/pixmaps
'';
# Wrap the program in a script that sets the LD_LIBRARY_PATH environment variable
# so that it can find the shared libraries it depends on. This is currently a
# requirement for running Rust programs that depend on `egui` within a Nix environment.
# https://github.com/emilk/egui/issues/2486
postFixup = ''
wrapProgram $out/bin/gpustat \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath buildInputs}:/run/opengl-driver/lib"
'';
meta = with lib; {
description = "A simple utility for viewing GPU utilization";
homepage = "https://github.com/arduano/gpustat";
license = licenses.asl20;
maintainers = with maintainers; [ arduano ];
mainProgram = "gpustat";
platforms = platforms.linux;
};
}

View File

@ -59,6 +59,6 @@ stdenv.mkDerivation {
mainProgram = "helix-gpt";
maintainers = with maintainers; [ happysalada ];
license = with licenses; [ mit ];
platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ];
platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" "aarch64-linux" ];
};
}

View File

@ -3,5 +3,6 @@
"srcHash": "sha256-wDVeX1tHw9pTxYLRkr8BJlF5XIee0/e0f5hzes4ui/o=",
"x86_64-linux": "sha256-h6wGkOfSbB8Rwm7eFvcowDdH1RdS6eFaxgf+SdYvYt8=",
"x86_64-darwin": "sha256-Sjt/JkyPRCzRpAqJOmBKCBAGWSeV7RYOOokCLYCqg+8=",
"aarch64-darwin": "sha256-Sjt/JkyPRCzRpAqJOmBKCBAGWSeV7RYOOokCLYCqg+8="
"aarch64-darwin": "sha256-Sjt/JkyPRCzRpAqJOmBKCBAGWSeV7RYOOokCLYCqg+8=",
"aarch64-linux": "sha256-h6wGkOfSbB8Rwm7eFvcowDdH1RdS6eFaxgf+SdYvYt8="
}

View File

@ -0,0 +1,37 @@
{ lib
, stdenvNoCC
, fetchurl
, undmg
}:
stdenvNoCC.mkDerivation rec {
pname = "hidden-bar";
version = "1.9";
src = fetchurl {
url = "https://github.com/dwarvesf/hidden/releases/download/v${version}/Hidden.Bar.${version}.dmg";
hash = "sha256-P1SwJPXBxAvBiuvjkBRxAom0fhR+cVYfriKmYcqybQI=";
};
sourceRoot = ".";
installPhase = ''
runHook preInstall
mkdir -p $out/Applications
mv "Hidden Bar.app" $out/Applications
runHook postInstall
'';
nativeBuildInputs = [ undmg ];
meta = {
description = "An ultra-light MacOS utility that helps hide menu bar icons";
homepage = "https://github.com/dwarvesf/hidden";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ donteatoreo ];
platforms = lib.platforms.darwin;
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
};
}

View File

@ -16,14 +16,14 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "home-manager";
version = "unstable-2024-03-31";
version = "unstable-2024-04-06";
src = fetchFromGitHub {
name = "home-manager-source";
owner = "nix-community";
repo = "home-manager";
rev = "30f2ec39519f4f5a8a96af808c439e730c15aeab";
hash = "sha256-QpZanlbVu6Gb2K96u3vgu0F2BvZD74+fOsIFWcYEXoY=";
rev = "b787726a8413e11b074cde42704b4af32d95545c";
hash = "sha256-ebq+fJZfobqpsAdGDGpxNWSySbQejRwW9cdiil6krCo=";
};
nativeBuildInputs = [

View File

@ -10,16 +10,16 @@
buildNpmPackage rec {
pname = "igir";
version = "2.6.1";
version = "2.6.2";
src = fetchFromGitHub {
owner = "emmercm";
repo = "igir";
rev = "v${version}";
hash = "sha256-0z+0/kRlHkUU3UijTru1sO+8u69cqsQbf06xjXJSb+A=";
hash = "sha256-bJPUGB9fyeOb5W9EzQldh4rRJQBat58MgjjfS1qh66w=";
};
npmDepsHash = "sha256-r1LCSEijj9kc+MdV9r8XWxG9dEm7Tot34mitrq3ykrM=";
npmDepsHash = "sha256-q8gpx5zwiO/7ZBB/YruhCUgukp71sfJju8nmF6SwTrc=";
# I have no clue why I have to do this
postPatch = ''

View File

@ -1,21 +1,23 @@
{ stdenv, lib, fetchFromGitHub, rustPlatform, perl, CoreServices, Security, SystemConfiguration }:
rustPlatform.buildRustPackage rec {
pname = "kak-lsp";
version = "15.0.1";
pname = "kakoune-lsp";
version = "16.0.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-W4z2YtOEBCTM+NsL1HBHSYCXJXN459chE4RW0CPMjD4=";
sha256 = "sha256-d4Tc6iYp20uOKMd+T2LhWgXWZzvzq1E+VWqjhhiIiHE=";
};
cargoHash = "sha256-tAA9eu4y1h6huNmEgY3L6v29itP5I4a8UZgoA+ANoq0=";
cargoHash = "sha256-kV8d0PwIWS6gyfCtv70iv8MrL91ZOZbwYznhc3lUw0U=";
buildInputs = [ perl ] ++ lib.optionals stdenv.isDarwin [ CoreServices Security SystemConfiguration ];
patches = [ ./0001-Use-full-Perl-path.patch ];
patches = [
./Use-full-Perl-path.patch
];
postPatch = ''
substituteInPlace rc/lsp.kak \
@ -24,7 +26,7 @@ rustPlatform.buildRustPackage rec {
meta = with lib; {
description = "Kakoune Language Server Protocol Client";
homepage = "https://github.com/kak-lsp/kak-lsp";
homepage = "https://github.com/kakoune-lsp/kakoune-lsp";
license = with licenses; [ unlicense /* or */ mit ];
maintainers = with maintainers; [ spacekookie poweredbypie ];
mainProgram = "kak-lsp";

View File

@ -0,0 +1,51 @@
{ lib
, stdenv
, fetchFromGitHub
, cmake
, extra-cmake-modules
, fftw
, krita
, libsForQt5
}:
stdenv.mkDerivation (finalAttrs: {
pname = "krita-plugin-gmic";
version = "3.2.4.1";
src = fetchFromGitHub {
owner = "amyspark";
repo = "gmic";
rev = "v${finalAttrs.version}";
hash = "sha256-SYE8kGvN7iD5OqiEEZpB/eRle67PrB5DojMC79qAQtg=";
};
sourceRoot = "${finalAttrs.src.name}/gmic-qt";
dontWrapQtApps = true;
postPatch = ''
patchShebangs \
translations/filters/csv2ts.sh \
translations/lrelease.sh
'';
nativeBuildInputs = [ cmake extra-cmake-modules ];
buildInputs = [
fftw
krita.unwrapped
libsForQt5.kcoreaddons
libsForQt5.qttools
];
cmakeFlags = [
(lib.cmakeFeature "GMIC_QT_HOST" "krita-plugin")
# build krita's gmic instead of using the one from nixpkgs
(lib.cmakeBool "ENABLE_SYSTEM_GMIC" false)
];
meta = with lib; {
homepage = "https://github.com/amyspark/gmic";
description = "GMic plugin for Krita";
license = lib.licenses.cecill21;
maintainers = with maintainers; [ lelgenio ];
};
})

View File

@ -0,0 +1,29 @@
{ lib, rustPlatform, fetchFromGitHub }:
rustPlatform.buildRustPackage rec {
pname = "ldproxy";
version = "0.31.4";
# The source of this tools actually comes from the set of tools located in the `esp-rs:embuild` repository
# cf: https://github.com/esp-rs/embuild
src = fetchFromGitHub {
owner = "esp-rs";
repo = "embuild";
rev = "v${version}";
hash = "sha256-YH2CPb3uBlPncd+KkP25xhCVvDB7HDxJuSqWOJ1LT3k=";
};
cargoHash = "sha256-HobX/aBn10KPpUKRSLt2IvfFVW7YpOu5tX4zNSCz6tw=";
# However we are only interested in building the specific crate located at `/ldproxy`
# cf: https://github.com/esp-rs/embuild/tree/v0.31.4/ldproxy
buildAndTestSubdir = "ldproxy";
meta = with lib; {
description = "Linker Proxy: a simple tool to forward linker arguments to the actual linker executable";
homepage = "https://github.com/esp-rs/embuild";
changelog = "https://github.com/esp-rs/embuild/blob/v${version}/CHANGELOG.md";
license = with licenses; [ mit /* or */ asl20 ];
maintainers = with maintainers; [ vpochapuis ];
};
}

File diff suppressed because it is too large Load Diff

View File

@ -32,19 +32,19 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "liana";
version = "4.0";
version = "5.0";
src = fetchFromGitHub {
owner = "wizardsardine";
repo = pname;
repo = "liana";
rev = "v${version}";
hash = "sha256-aeNbPtzS8QhZ+d/HC9/Nx1GvIWsCrjUrMqghIspt2+o=";
hash = "sha256-RkZ2HSN7IjwN3tD0UhpMeQeqkb+Y79kSWnjJZ5KPbQk=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"liana-4.0.0" = "sha256-GT5/HlFU+Cf/Q5aQoT6ldZ+f+7I+S3wpUbq3JAhJjz8=";
"liana-5.0.0" = "sha256-wePqsVpMBRP2eJZd8W05CaeesqY5g/rnr4OonmRzeeM=";
"iced_futures-0.6.0" = "sha256-ejkAxU6DwiX1/119eA0GRapSmz7dqwx9M0uMwyDHATQ=";
};
};

View File

@ -72,13 +72,13 @@ let
in
effectiveStdenv.mkDerivation (finalAttrs: {
pname = "llama-cpp";
version = "2568";
version = "2589";
src = fetchFromGitHub {
owner = "ggerganov";
repo = "llama.cpp";
rev = "refs/tags/b${finalAttrs.version}";
hash = "sha256-yBlLChtzfAi2TAGUO1zdnpHCvi5YDCzjdflQgTWh98Y=";
hash = "sha256-VvTXNEl1pzzwSBT6JSOyvys3tHkjp1n6lVGngD97J74=";
};
postPatch = ''

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