colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into haskell-updates

Browse Source
This commit is contained in:
github-actions[bot] 2023-02-05 00:14:15 +00:00 committed by GitHub
commit 1da3736c69
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
162 changed files with 2311 additions and 1110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
maintainers/maintainer-list.nix
View File

@ -2325,6 +2325,12 @@
githubId = 3212452;
name = "Cameron Nemo";
};
camillemndn = {
email = "camillemondon@free.fr";
github = "camillemndn";
githubId = 26444818;
name = "Camille M.";
};
campadrenalin = {
email = "campadrenalin@gmail.com";
github = "campadrenalin";
@ -6632,6 +6638,12 @@
github = "jayeshbhoot";
githubId = 1915507;
};
jayman2000 = {
email = "jason@jasonyundt.email";
github = "Jayman2000";
githubId = 5579359;
name = "Jason Yundt";
};
jb55 = {
email = "jb55@jb55.com";
github = "jb55";
@ -7009,6 +7021,12 @@
githubId = 2308444;
name = "Joshua Gilman";
};
jnsgruk = {
email = "jon@sgrs.uk";
github = "jnsgruk";
githubId = 668505;
name = "Jon Seager";
};
jo1gi = {
email = "joakimholm@protonmail.com";
github = "jo1gi";
@ -13222,6 +13240,12 @@
githubId = 38824235;
name = "Serge Belov";
};
serge_sans_paille = {
email = "serge.guelton@telecom-bretagne.eu";
github = "serge-sans-paille";
githubId = 863807;
name = "Serge Guelton";
};
sersorrel = {
email = "ash@sorrel.sh";
github = "sersorrel";

6
nixos/doc/manual/from_md/release-notes/rl-2305.section.xml
View File

@ -858,6 +858,12 @@
<literal>libax25</literal> package.
</para>
</listitem>
<listitem>
<para>
<literal>tvbrowser-bin</literal> was removed, and now
<literal>tvbrowser</literal> is built from source.
</para>
</listitem>
<listitem>
<para>
<literal>nixos-version</literal> now accepts

2
nixos/doc/manual/release-notes/rl-2305.section.md
View File

@ -213,6 +213,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- [Xastir](https://xastir.org/index.php/Main_Page) can now access AX.25 interfaces via the `libax25` package.
- `tvbrowser-bin` was removed, and now `tvbrowser` is built from source.
- `nixos-version` now accepts `--configuration-revision` to display more information about the current generation revision
- The option `services.nomad.extraSettingsPlugins` has been fixed to allow more than one plugin in the path.

2
nixos/modules/module-list.nix
View File

@ -195,6 +195,7 @@
./programs/mdevctl.nix
./programs/mepo.nix
./programs/mininet.nix
./programs/miriway.nix
./programs/mosh.nix
./programs/msmtp.nix
./programs/mtr.nix
@ -1364,6 +1365,7 @@
./virtualisation/lxc.nix
./virtualisation/lxcfs.nix
./virtualisation/lxd.nix
./virtualisation/multipass.nix
./virtualisation/nixos-containers.nix
./virtualisation/oci-containers.nix
./virtualisation/openstack-options.nix

60
nixos/modules/programs/miriway.nix Normal file
View File

@ -0,0 +1,60 @@
{ config, pkgs, lib, ... }:
let
cfg = config.programs.miriway;
in {
options.programs.miriway = {
enable = lib.mkEnableOption (lib.mdDoc ''
Miriway, a Mir based Wayland compositor. You can manually launch Miriway by
executing "exec miriway" on a TTY, or launch it from a display manager. Copy
/etc/xdg/xdg-miriway/miriway-shell.config to ~/.config/miriway-shell.config
to modify the default configuration. See <https://github.com/Miriway/Miriway>,
and "miriway --help" for more information'');
config = lib.mkOption {
type = lib.types.lines;
default = ''
x11-window-title=Miriway (Mir-on-X)
idle-timeout=600
ctrl-alt=t:miriway-terminal # Default "terminal emulator finder"
shell-component=dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY
'';
example = ''
idle-timeout=300
ctrl-alt=t:weston-terminal
add-wayland-extensions=all
shell-components=dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY
shell-component=waybar
shell-component=wbg Pictures/wallpaper
shell-meta=a:synapse
'';
description = lib.mdDoc ''
Miriway's config. This will be installed system-wide.
The default will install the miriway package's barebones example config.
'';
};
};
config = lib.mkIf cfg.enable {
environment = {
systemPackages = [ pkgs.miriway ];
etc = {
"xdg/xdg-miriway/miriway-shell.config".text = cfg.config;
};
};
hardware.opengl.enable = lib.mkDefault true;
fonts.enableDefaultFonts = lib.mkDefault true;
programs.dconf.enable = lib.mkDefault true;
programs.xwayland.enable = lib.mkDefault true;
# To make the Miriway session available if a display manager like SDDM is enabled:
services.xserver.displayManager.sessionPackages = [ pkgs.miriway ];
};
meta.maintainers = with lib.maintainers; [ OPNA2608 ];
}

73
nixos/modules/services/x11/desktop-managers/plasma5.nix
View File

@ -28,52 +28,11 @@ let
libsForQt5 = pkgs.plasma5Packages;
inherit (libsForQt5) kdeGear kdeFrameworks plasma5;
inherit (pkgs) writeText;
inherit (lib)
getBin optionalString literalExpression
mkRemovedOptionModule mkRenamedOptionModule
mkDefault mkIf mkMerge mkOption mkPackageOptionMD types;
ini = pkgs.formats.ini { };
gtkrc2 = writeText "gtkrc-2.0" ''
# Default GTK+ 2 config for NixOS Plasma 5
include "/run/current-system/sw/share/themes/Breeze/gtk-2.0/gtkrc"
style "user-font"
{
font_name="Sans Serif Regular"
}
widget_class "*" style "user-font"
gtk-font-name="Sans Serif Regular 10"
gtk-theme-name="Breeze"
gtk-icon-theme-name="breeze"
gtk-fallback-icon-theme="hicolor"
gtk-cursor-theme-name="breeze_cursors"
gtk-toolbar-style=GTK_TOOLBAR_ICONS
gtk-menu-images=1
gtk-button-images=1
'';
gtk3_settings = ini.generate "settings.ini" {
Settings = {
gtk-font-name = "Sans Serif Regular 10";
gtk-theme-name = "Breeze";
gtk-icon-theme-name = "breeze";
gtk-fallback-icon-theme = "hicolor";
gtk-cursor-theme-name = "breeze_cursors";
gtk-toolbar-style = "GTK_TOOLBAR_ICONS";
gtk-menu-images = 1;
gtk-button-images = 1;
};
};
kcminputrc = ini.generate "kcminputrc" {
Mouse = {
cursorTheme = "breeze_cursors";
cursorSize = 0;
};
};
activationScript = ''
${set_XDG_CONFIG_HOME}
@ -119,37 +78,6 @@ let
XDG_CONFIG_HOME=''${XDG_CONFIG_HOME:-$HOME/.config}
'';
startplasma = ''
${set_XDG_CONFIG_HOME}
mkdir -p "''${XDG_CONFIG_HOME}"
'' + optionalString config.hardware.pulseaudio.enable ''
# Load PulseAudio module for routing support.
# See also: http://colin.guthr.ie/2009/10/so-how-does-the-kde-pulseaudio-support-work-anyway/
${getBin config.hardware.pulseaudio.package}/bin/pactl load-module module-device-manager "do_routing=1"
'' + ''
${activationScript}
# Create default configurations if Plasma has never been started.
kdeglobals="''${XDG_CONFIG_HOME}/kdeglobals"
if ! [ -f "$kdeglobals" ]; then
kcminputrc="''${XDG_CONFIG_HOME}/kcminputrc"
if ! [ -f "$kcminputrc" ]; then
cat ${kcminputrc} >"$kcminputrc"
fi
gtkrc2="$HOME/.gtkrc-2.0"
if ! [ -f "$gtkrc2" ]; then
cat ${gtkrc2} >"$gtkrc2"
fi
gtk3_settings="''${XDG_CONFIG_HOME}/gtk-3.0/settings.ini"
if ! [ -f "$gtk3_settings" ]; then
mkdir -p "$(dirname "$gtk3_settings")"
cat ${gtk3_settings} >"$gtk3_settings"
fi
fi
'';
in
{
@ -474,7 +402,6 @@ in
# Update the start menu for each user that is currently logged in
system.userActivationScripts.plasmaSetup = activationScript;
services.xserver.displayManager.setupCommands = startplasma;
nixpkgs.config.firefox.enablePlasmaBrowserIntegration = true;
})

61
nixos/modules/virtualisation/multipass.nix Normal file
View File

@ -0,0 +1,61 @@
{ config
, lib
, pkgs
, ...
}:
let
cfg = config.virtualisation.multipass;
in
{
options = {
virtualisation.multipass = {
enable = lib.mkEnableOption (lib.mdDoc ''
Multipass, a simple manager for virtualised Ubuntu instances.
'');
logLevel = lib.mkOption {
type = lib.types.enum [ "error" "warning" "info" "debug" "trace" ];
default = "debug";
description = lib.mdDoc ''
The logging verbosity of the multipassd binary.
'';
};
package = lib.mkPackageOptionMD pkgs "multipass" { };
};
};
config = lib.mkIf cfg.enable {
environment.systemPackages = [ cfg.package ];
systemd.services.multipass = {
description = "Multipass orchestrates virtual Ubuntu instances.";
wantedBy = [ "multi-user.target" ];
wants = [ "network.target" ];
after = [ "network.target" ];
environment = {
"XDG_DATA_HOME" = "/var/lib/multipass/data";
"XDG_CACHE_HOME" = "/var/lib/multipass/cache";
"XDG_CONFIG_HOME" = "/var/lib/multipass/config";
};
serviceConfig = {
ExecStart = "${cfg.package}/bin/multipassd --logger platform --verbosity ${cfg.logLevel}";
SyslogIdentifer = "multipassd";
Restart = "on-failure";
TimeoutStopSec = 300;
Type = "simple";
WorkingDirectory = "/var/lib/multipass";
StateDirectory = "multipass";
StateDirectoryMode = "0750";
CacheDirectory = "multipass";
CacheDirectoryMode = "0750";
};
};
};
}

47
nixos/modules/virtualisation/virtualbox-image.nix
View File

@ -107,6 +107,46 @@ in {
};
});
};
postExportCommands = mkOption {
type = types.lines;
default = "";
example = ''
${pkgs.cot}/bin/cot edit-hardware "$fn" \
-v vmx-14 \
--nics 2 \
--nic-types VMXNET3 \
--nic-names 'Nic name' \
--nic-networks 'Nic match' \
--network-descriptions 'Nic description' \
--scsi-subtypes VirtualSCSI
'';
description = lib.mdDoc ''
Extra commands to run after exporting the OVA to `$fn`.
'';
};
storageController = mkOption {
type = with types; attrsOf (oneOf [ str int bool (listOf str) ]);
example = {
name = "SCSI";
add = "scsi";
portcount = 16;
bootable = "on";
hostiocache = "on";
};
default = {
name = "SATA";
add = "sata";
portcount = 4;
bootable = "on";
hostiocache = "on";
};
description = lib.mdDoc ''
Parameters passed to the VirtualBox appliance. Must have at least
`name`.
Run `VBoxManage storagectl --help` to see more options.
'';
};
};
};
@ -167,11 +207,11 @@ in {
VBoxManage modifyvm "$vmName" \
--memory ${toString cfg.memorySize} \
${lib.cli.toGNUCommandLineShell { } cfg.params}
VBoxManage storagectl "$vmName" --name SATA --add sata --portcount 4 --bootable on --hostiocache on
VBoxManage storageattach "$vmName" --storagectl SATA --port 0 --device 0 --type hdd \
VBoxManage storagectl "$vmName" ${lib.cli.toGNUCommandLineShell { } cfg.storageController}
VBoxManage storageattach "$vmName" --storagectl ${cfg.storageController.name} --port 0 --device 0 --type hdd \
--medium disk.vmdk
${optionalString (cfg.extraDisk != null) ''
VBoxManage storageattach "$vmName" --storagectl SATA --port 1 --device 0 --type hdd \
VBoxManage storageattach "$vmName" --storagectl ${cfg.storageController.name} --port 1 --device 0 --type hdd \
--medium data-disk.vmdk
''}
@ -179,6 +219,7 @@ in {
mkdir -p $out
fn="$out/${cfg.vmFileName}"
VBoxManage export "$vmName" --output "$fn" --options manifest ${escapeShellArgs cfg.exportParams}
${cfg.postExportCommands}
rm -v $diskImage

2
nixos/tests/all-tests.nix
View File

@ -398,6 +398,7 @@ in {
minidlna = handleTest ./minidlna.nix {};
miniflux = handleTest ./miniflux.nix {};
minio = handleTest ./minio.nix {};
miriway = handleTest ./miriway.nix {};
misc = handleTest ./misc.nix {};
mjolnir = handleTest ./matrix/mjolnir.nix {};
mod_perl = handleTest ./mod_perl.nix {};
@ -411,6 +412,7 @@ in {
mpd = handleTest ./mpd.nix {};
mpv = handleTest ./mpv.nix {};
mtp = handleTest ./mtp.nix {};
multipass = handleTest ./multipass.nix {};
mumble = handleTest ./mumble.nix {};
musescore = handleTest ./musescore.nix {};
munin = handleTest ./munin.nix {};

126
nixos/tests/miriway.nix Normal file
View File

@ -0,0 +1,126 @@
import ./make-test-python.nix ({ pkgs, lib, ... }: {
name = "miriway";
meta = {
maintainers = with lib.maintainers; [ OPNA2608 ];
# FIXME On ARM Miriway inside the VM doesn't receive keyboard inputs, why?
broken = pkgs.stdenv.hostPlatform.isAarch;
};
nodes.machine = { config, ... }: {
imports = [
./common/auto.nix
./common/user-account.nix
];
# Seems to very rarely get interrupted by oom-killer
virtualisation.memorySize = 2047;
test-support.displayManager.auto = {
enable = true;
user = "alice";
};
services.xserver = {
enable = true;
displayManager.defaultSession = lib.mkForce "miriway";
};
programs.miriway = {
enable = true;
config = ''
add-wayland-extensions=all
ctrl-alt=t:foot --maximized
ctrl-alt=a:env WINIT_UNIX_BACKEND=x11 WAYLAND_DISPLAY=invalid alacritty --option window.startup_mode=maximized
shell-component=dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY
shell-component=foot --maximized
'';
};
environment = {
shellAliases = {
test-wayland = "wayland-info | tee /tmp/test-wayland.out && touch /tmp/test-wayland-exit-ok";
test-x11 = "glinfo | tee /tmp/test-x11.out && touch /tmp/test-x11-exit-ok";
};
systemPackages = with pkgs; [
mesa-demos
wayland-utils
foot
alacritty
];
# To help with OCR
etc."xdg/foot/foot.ini".text = lib.generators.toINI { } {
main = {
font = "inconsolata:size=16";
};
colors = rec {
foreground = "000000";
background = "ffffff";
regular2 = foreground;
};
};
etc."xdg/alacritty/alacritty.yml".text = lib.generators.toYAML { } {
font = rec {
normal.family = "Inconsolata";
bold.family = normal.family;
italic.family = normal.family;
bold_italic.family = normal.family;
size = 16;
};
colors = rec {
primary = {
foreground = "0x000000";
background = "0xffffff";
};
normal = {
green = primary.foreground;
};
};
};
};
fonts.fonts = [ pkgs.inconsolata ];
};
enableOCR = true;
testScript = { nodes, ... }: ''
start_all()
machine.wait_for_unit("multi-user.target")
# Wait for Miriway to complete startup
machine.wait_for_file("/run/user/1000/wayland-0")
machine.succeed("pgrep miriway-shell")
machine.screenshot("miriway_launched")
# Test Wayland
# We let Miriway start the first terminal, as we might get stuck if it's not ready to process the first keybind
# machine.send_key("ctrl-alt-t")
machine.wait_for_text("alice@machine")
machine.send_chars("test-wayland\n")
machine.wait_for_file("/tmp/test-wayland-exit-ok")
machine.copy_from_vm("/tmp/test-wayland.out")
machine.screenshot("foot_wayland_info")
# Only succeeds when a mouse is moved inside an interactive session?
# machine.send_chars("exit\n")
# machine.wait_until_fails("pgrep foot")
machine.succeed("pkill foot")
# Test XWayland
machine.send_key("ctrl-alt-a")
machine.wait_for_text("alice@machine")
machine.send_chars("test-x11\n")
machine.wait_for_file("/tmp/test-x11-exit-ok")
machine.copy_from_vm("/tmp/test-x11.out")
machine.screenshot("alacritty_glinfo")
# Only succeeds when a mouse is moved inside an interactive session?
# machine.send_chars("exit\n")
# machine.wait_until_fails("pgrep alacritty")
machine.succeed("pkill alacritty")
'';
})

37
nixos/tests/multipass.nix Normal file
View File

@ -0,0 +1,37 @@
import ./make-test-python.nix ({ pkgs, lib, ... }:
let
multipass-image = import ../release.nix {
configuration = {
# Building documentation makes the test unnecessarily take a longer time:
documentation.enable = lib.mkForce false;
};
};
in
{
name = "multipass";
meta.maintainers = [ lib.maintainers.jnsgruk ];
nodes.machine = { lib, ... }: {
virtualisation = {
cores = 1;
memorySize = 1024;
diskSize = 4096;
multipass.enable = true;
};
};
testScript = ''
machine.wait_for_unit("sockets.target")
machine.wait_for_unit("multipass.service")
machine.wait_for_file("/var/lib/multipass/data/multipassd/network/multipass_subnet")
# Wait for Multipass to settle
machine.sleep(1)
machine.succeed("multipass list")
'';
})

32
pkgs/applications/audio/airwave/default.nix
View File

@ -1,5 +1,16 @@
{ lib, stdenv, multiStdenv, cmake, fetchFromGitHub, file, libX11, makeWrapper
, qt5, requireFile, unzip, wine
{ lib,
stdenv,
multiStdenv,
fetchFromGitHub,
requireFile,
unzip,
wine,
cmake,
makeWrapper,
wrapQtAppsHook,
file,
libX11,
qt5
}:
let
@ -13,11 +24,11 @@ let
};
vst-sdk = stdenv.mkDerivation rec {
name = "vstsdk368_08_11_2017_build_121";
name = "vstsdk369_01_03_2018_build_132";
src = requireFile {
name = "${name}.zip";
url = "http://www.steinberg.net/en/company/developers.html";
sha256 = "e0f235d8826d70f1ae0ae5929cd198acae1ecff74612fde5c60cbfb45c2f4a70";
sha256 = "0r29fv6yhm2m5yznn8m4my7fq01w1lpphax4sshagy6b1dgjlv3w";
};
nativeBuildInputs = [ unzip ];
installPhase = "cp -r . $out";
@ -42,9 +53,18 @@ multiStdenv.mkDerivation {
src = airwave-src;
nativeBuildInputs = [ cmake makeWrapper ];
nativeBuildInputs = [
cmake
makeWrapper
wrapQtAppsHook
];
buildInputs = [ file libX11 qt5.qtbase wine-xembed ];
buildInputs = [
file
libX11
qt5.qtbase
wine-xembed
];
postPatch = ''
# Binaries not used directly should land in libexec/.

51
pkgs/applications/blockchains/ton/default.nix Normal file
View File

@ -0,0 +1,51 @@
{ lib
, stdenv
, fetchFromGitHub
, cmake
, git
, gperf
, libmicrohttpd
, openssl
, readline
, zlib
}:
stdenv.mkDerivation rec {
pname = "ton";
version = "2023.01";
src = fetchFromGitHub {
owner = "ton-blockchain";
repo = "ton";
rev = "v${version}";
sha256 = "sha256-wb96vh0YcTBFE8EzBItdTf88cvRMLW2XxcGJpNetOi8=";
fetchSubmodules = true;
};
postPatch = ''
# without this fails on aarch64-darwin with clang-11: error: the clang compiler does not support '-mcpu=apple-m1'
substituteInPlace CMakeLists.txt \
--replace 'set(TON_ARCH "apple-m1")' ""
'';
nativeBuildInputs = [
cmake
git
];
buildInputs = [
gperf
libmicrohttpd
openssl
readline
zlib
];
meta = with lib; {
description = "A fully decentralized layer-1 blockchain designed by Telegram";
homepage = "https://ton.org/";
license = licenses.lgpl2Only;
platforms = platforms.all;
maintainers = with maintainers; [ misuzu ];
};
}

226
pkgs/applications/editors/vim/plugins/generated.nix
View File

@ -293,12 +293,12 @@ final: prev:
SchemaStore-nvim = buildVimPluginFrom2Nix {
pname = "SchemaStore.nvim";
version = "2023-01-30";
version = "2023-02-04";
src = fetchFromGitHub {
owner = "b0o";
repo = "SchemaStore.nvim";
rev = "d98828169af99624031d8535785a099cdf60d4c3";
sha256 = "0j3lkz7lbd0naqqp6y2nlk9zawd453m41diia7f0saiyix76r6cp";
rev = "5c5723bd464fd048f5d62fcf20c41495d3386a33";
sha256 = "1vpay869faixkxpvxlwpk44pidjgnrhkchnchfsbd6c2brhgzz11";
};
meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";
};
@ -559,12 +559,12 @@ final: prev:
ale = buildVimPluginFrom2Nix {
pname = "ale";
version = "2023-02-02";
version = "2023-02-03";
src = fetchFromGitHub {
owner = "dense-analysis";
repo = "ale";
rev = "98f466f9ce851edeb99fa14a75fca1f266f62d52";
sha256 = "12g90abfnb7nmb2s5q9w6hn27hpwplghhxz5w38m6dghy8nmfs4n";
rev = "45a3e3f574172028338de70ce8f8f606dec0a1b0";
sha256 = "0xyglfdqr8bq4s5mqq7wvj8czl1n9pgs16368q2zjj9j35x6m8xr";
};
meta.homepage = "https://github.com/dense-analysis/ale/";
};
@ -727,12 +727,12 @@ final: prev:
aurora = buildVimPluginFrom2Nix {
pname = "aurora";
version = "2023-02-02";
version = "2023-02-04";
src = fetchFromGitHub {
owner = "ray-x";
repo = "aurora";
rev = "ef44f07a563d59b23c3f17792f4ff3b5fb4280a1";
sha256 = "14w830fnr19rnjqwg5yqns4xf27nhvc169qrmkjn8y054i6yjsg2";
rev = "f7b2df980aa0518a1a208974dfcbc51ff91b531e";
sha256 = "1d0p7d7kicqy4bbh3kaxn9as71afjljp38lhcc595l2b8nlaf2hc";
};
meta.homepage = "https://github.com/ray-x/aurora/";
};
@ -859,12 +859,12 @@ final: prev:
barbecue-nvim = buildVimPluginFrom2Nix {
pname = "barbecue.nvim";
version = "2023-02-01";
version = "2023-02-04";
src = fetchFromGitHub {
owner = "utilyre";
repo = "barbecue.nvim";
rev = "e3db3c4e25f5531bcb74b7951f52e425731433e5";
sha256 = "0b69g3vr78x4hy5sj354iws43x4mm8qlqwfzl6cbiga16pa659ay";
rev = "572e4070d1f26ce7252570823598a656e828a9ec";
sha256 = "0k8mh345m8xxmss04zwscmpyfwxsa8pwd8pjklgv8njgxr5hk1hr";
};
meta.homepage = "https://github.com/utilyre/barbecue.nvim/";
};
@ -1315,12 +1315,12 @@ final: prev:
cmp-dictionary = buildVimPluginFrom2Nix {
pname = "cmp-dictionary";
version = "2023-02-02";
version = "2023-02-04";
src = fetchFromGitHub {
owner = "uga-rosa";
repo = "cmp-dictionary";
rev = "8b5acfbc79eea0bfe2c08ffeb8f137f13449ab56";
sha256 = "18j7rdq32xmmdh2bazfyv1q0d37ravz8x9brm8v1z9gracbly43a";
rev = "5662ec89119c49a806b77b5df7517017abe47f8e";
sha256 = "0md3msnkyw2dgkpgp12iskrdv7p4sywmdg4ifdmbcl56qn1dv5zr";
};
meta.homepage = "https://github.com/uga-rosa/cmp-dictionary/";
};
@ -1759,12 +1759,12 @@ final: prev:
coc-lua = buildVimPluginFrom2Nix {
pname = "coc-lua";
version = "2023-02-01";
version = "2023-02-04";
src = fetchFromGitHub {
owner = "josa42";
repo = "coc-lua";
rev = "80858aa01d57ed2f93c6bc388bad373810d41a21";
sha256 = "0rcikmjdhcw39kngx93snpnn0sh780drqnn342gg9ifnysbva3d9";
rev = "9f702344b9550800e9ca928cd21fd6dcc8dffaef";
sha256 = "10s0nqhybry6m6p13gvmchmc6in7zn7pgi1930svy7czqblcg6rw";
};
meta.homepage = "https://github.com/josa42/coc-lua/";
};
@ -2155,12 +2155,12 @@ final: prev:
coq_nvim = buildVimPluginFrom2Nix {
pname = "coq_nvim";
version = "2023-01-29";
version = "2023-02-04";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "coq_nvim";
rev = "b6032a67b53ca92b7bda401ef45284e888c5f4b6";
sha256 = "1wxwwnbbz25idi4bwqzb9byf44awss97ca1925n5gmxq19g7x1gc";
rev = "d11f4eb12d73c5dcf5d6691378b18447446ec919";
sha256 = "08kkp57k4138cb4jgv3q3x3h2qx7f29kr914lzqzrb7q4ybzm6b8";
};
meta.homepage = "https://github.com/ms-jpq/coq_nvim/";
};
@ -2299,12 +2299,12 @@ final: prev:
dashboard-nvim = buildVimPluginFrom2Nix {
pname = "dashboard-nvim";
version = "2023-02-02";
version = "2023-02-04";
src = fetchFromGitHub {
owner = "glepnir";
repo = "dashboard-nvim";
rev = "f4eedba90f0a55111351fd45444db5a82081727f";
sha256 = "00h2n33m6mhvkxqdrwnfijwj2j5v0j6daa9422mmxf6m3qxgs03k";
rev = "d69d20170e12a20fa305e90870d6016e636cc328";
sha256 = "18i9rjjv7g5hr1gyb98w3mh50m1iwk643rb93z1n7f38ln55xzw8";
};
meta.homepage = "https://github.com/glepnir/dashboard-nvim/";
};
@ -3615,8 +3615,8 @@ final: prev:
src = fetchFromGitHub {
owner = "MrcJkb";
repo = "haskell-tools.nvim";
rev = "6e19cdf88d0d681312db5e27a4a2ef6b8e43fc47";
sha256 = "0i6l2fvwww7kljp3321j4vp5wlmnlgf8hk6v1r0jmi7qs172zg1d";
rev = "03dfa7fa3d08a34cdef09ca05a6da166a1ba22a2";
sha256 = "166ar0qy3pl2jvw7y6im7v7gmrsji44ph1aahxqdpgbf170xx6pa";
};
meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/";
};
@ -3884,6 +3884,18 @@ final: prev:
meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/";
};
indent-o-matic = buildVimPluginFrom2Nix {
pname = "indent-o-matic";
version = "2023-01-24";
src = fetchFromGitHub {
owner = "Darazaki";
repo = "indent-o-matic";
rev = "3103dde7a47f2855097558ab52162bbbdbe8dc40";
sha256 = "1nfwzqki00x5vv75iawyky122v68qcajihfcdqxixlqln3srrmi4";
};
meta.homepage = "https://github.com/Darazaki/indent-o-matic/";
};
indentLine = buildVimPluginFrom2Nix {
pname = "indentLine";
version = "2022-09-07";
@ -4223,12 +4235,12 @@ final: prev:
leap-nvim = buildVimPluginFrom2Nix {
pname = "leap.nvim";
version = "2023-02-02";
version = "2023-02-04";
src = fetchFromGitHub {
owner = "ggandor";
repo = "leap.nvim";
rev = "6068651f7f2bdb379344de52b9833d82bce27cec";
sha256 = "0skyq97hzslpx3w5y6ikcqbblzn1yqfwmk1wxrrmwayvyfcqqh9j";
rev = "f565a9c4d92245d8b619235bebeaa73cc38aa40e";
sha256 = "1i40bi18wn7vg6mdcg0xp5zxk960lzj4kzda3syj51sv1pgdq802";
};
meta.homepage = "https://github.com/ggandor/leap.nvim/";
};
@ -4775,12 +4787,12 @@ final: prev:
mason-nvim = buildVimPluginFrom2Nix {
pname = "mason.nvim";
version = "2023-02-02";
version = "2023-02-04";
src = fetchFromGitHub {
owner = "williamboman";
repo = "mason.nvim";
rev = "24846a00941ec020c8addc7f52040a1b2fc12174";
sha256 = "1civr6qrq7c0z50yx7y9ly6w76vv5a1h0iqa1rxw8spc7h66hdva";
rev = "9ec92c1945b11ba7e7e6730fd60fd44525f24a25";
sha256 = "0snf7j4x4cmwrw81bwm3fj8k07l8iriqwzc5c47bl2w94fpbynyc";
};
meta.homepage = "https://github.com/williamboman/mason.nvim/";
};
@ -4847,12 +4859,12 @@ final: prev:
mini-nvim = buildVimPluginFrom2Nix {
pname = "mini.nvim";
version = "2023-02-03";
version = "2023-02-04";
src = fetchFromGitHub {
owner = "echasnovski";
repo = "mini.nvim";
rev = "4f97a8771a480bcacf1d1d0dbf82e47f682aba2c";
sha256 = "1pnivvwh9bfddmqvzgs4qsc3qy2m8j4zk31d5l6dgz8bfp45c7w1";
rev = "33e76b0c22465de03906ebd00c01b64a04e495b3";
sha256 = "0kxfwmvp7pgvqr6cqs6zf5dklq6n7vcgzr1dj435f8yg6zh90aah";
};
meta.homepage = "https://github.com/echasnovski/mini.nvim/";
};
@ -5207,12 +5219,12 @@ final: prev:
neoconf-nvim = buildVimPluginFrom2Nix {
pname = "neoconf.nvim";
version = "2023-02-03";
version = "2023-02-04";
src = fetchFromGitHub {
owner = "folke";
repo = "neoconf.nvim";
rev = "a16d133b426fe5ddfd97d30e3658772d403847f3";
sha256 = "03dbdllmvp68cfzf8m3sz8v9795h4mp28gd27bcvxyfjiif7r5lj";
rev = "de8dbd4ba6583619ed02323dbde737d586ba572f";
sha256 = "1ms7chmmilq8slf659m8d45i39pllgng7a95fc20ykwbakhi8m9b";
};
meta.homepage = "https://github.com/folke/neoconf.nvim/";
};
@ -5231,28 +5243,40 @@ final: prev:
neodev-nvim = buildVimPluginFrom2Nix {
pname = "neodev.nvim";
version = "2023-02-03";
version = "2023-02-04";
src = fetchFromGitHub {
owner = "folke";
repo = "neodev.nvim";
rev = "d9a8d651501cd2f287742472af4b3103d991cd68";
sha256 = "1pi2b2j647cwc58cp5iwgrrfls7lfwh7573r092k3c42i2x9k8cd";
rev = "70cab52c9d19e982f306716534e90c37a254b046";
sha256 = "13xrc45s5fx8y2dl1ds155r5w0yrivq2b1aqvqjk7ywgyyq2wr5l";
};
meta.homepage = "https://github.com/folke/neodev.nvim/";
};
neoformat = buildVimPluginFrom2Nix {
pname = "neoformat";
version = "2023-01-11";
version = "2023-02-04";
src = fetchFromGitHub {
owner = "sbdchd";
repo = "neoformat";
rev = "ec601d38a2e9309109f405ce038c5a6ce774f1a9";
sha256 = "028xycbvjhs7mvnzlismjipibgqdhjm9s0asmjpg3g7y2qhkw3ix";
rev = "2e9fd3a7cbdce0c90379c8bc52e0bca6726eba81";
sha256 = "02f77wwhb1wfk9bcvy5mnc4r2rdgw6b3pdmacizmjnd1a9ajqysn";
};
meta.homepage = "https://github.com/sbdchd/neoformat/";
};
neogen = buildVimPluginFrom2Nix {
pname = "neogen";
version = "2023-01-16";
src = fetchFromGitHub {
owner = "danymat";
repo = "neogen";
rev = "465af9d6c6fb7f360175991dcc23fc10917e3a06";
sha256 = "08frlngajmb1905f52xh299h8l3mf34lp4aa5rgs2hl96iafbjr3";
};
meta.homepage = "https://github.com/danymat/neogen/";
};
neogit = buildVimPluginFrom2Nix {
pname = "neogit";
version = "2023-01-31";
@ -5315,12 +5339,12 @@ final: prev:
neorg = buildVimPluginFrom2Nix {
pname = "neorg";
version = "2023-02-03";
version = "2023-02-04";
src = fetchFromGitHub {
owner = "nvim-neorg";
repo = "neorg";
rev = "6cc56c6b50fcac81471805d50db7cf5770cb5e8a";
sha256 = "1zwcbfl23rnk7hq5d2m0blxwanlws3hikk7k89cbsc76kwqims2y";
rev = "ac8828369cb2a4b2e1e17e6b495645585ed2a37b";
sha256 = "1ljyzvk3ff876sp4idfqq3ziqm7c6wc63kii3nsvh9i4m0w5i5af";
};
meta.homepage = "https://github.com/nvim-neorg/neorg/";
};
@ -5555,12 +5579,12 @@ final: prev:
nlsp-settings-nvim = buildVimPluginFrom2Nix {
pname = "nlsp-settings.nvim";
version = "2023-02-02";
version = "2023-02-04";
src = fetchFromGitHub {
owner = "tamago324";
repo = "nlsp-settings.nvim";
rev = "5541d073b93a404445907e0aec3ebd9cf8914e53";
sha256 = "0r4bbppp95rdhpz9j24w6smpzv891gk1ja6dis7j4gf3sra57hqy";
rev = "c2db6cfd687df2fba323ba31ad0d862d6129f62c";
sha256 = "0k7mhz2k05qwyrx9iyc9psjfshxzw8p1618fiyr7cck9aphzwqlf";
};
meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/";
};
@ -6227,12 +6251,12 @@ final: prev:
nvim-navic = buildVimPluginFrom2Nix {
pname = "nvim-navic";
version = "2023-01-26";
version = "2023-02-04";
src = fetchFromGitHub {
owner = "smiteshp";
repo = "nvim-navic";
rev = "11e08391eeed00effa85ca24ff9d1e0472cbcd6a";
sha256 = "16nr10lyzq45hm49mh2y6xjk8f59bra1mzgybclz09l9aikzmkhq";
rev = "7e9d2b2b601149fecdccd11b516acb721e571fe6";
sha256 = "02dzs5bh29ncvz3nzc2isnz9y5c99mx5qm97nvwrbbvxcp3yah2m";
};
meta.homepage = "https://github.com/smiteshp/nvim-navic/";
};
@ -6251,12 +6275,12 @@ final: prev:
nvim-nonicons = buildVimPluginFrom2Nix {
pname = "nvim-nonicons";
version = "2022-12-22";
version = "2023-02-04";
src = fetchFromGitHub {
owner = "yamatsum";
repo = "nvim-nonicons";
rev = "68ecb6476f1b96d03c702dce6cf3ef1e5171c9a8";
sha256 = "1vmzl5b3a07kh8b4wqqxd05sygvlyxq9vkrsshn2lrxmpbdg6227";
rev = "ceda07dc7339f35444b5f4c4016f76a9eb42ac16";
sha256 = "0kcagkzgvib0jg9aywfvrk4bx7pdyk7zj5b5i4wzacdcyx5yb7mx";
};
meta.homepage = "https://github.com/yamatsum/nvim-nonicons/";
};
@ -6395,24 +6419,24 @@ final: prev:
nvim-tree-lua = buildVimPluginFrom2Nix {
pname = "nvim-tree.lua";
version = "2023-01-31";
version = "2023-02-04";
src = fetchFromGitHub {
owner = "nvim-tree";
repo = "nvim-tree.lua";
rev = "215b29bfad74518442621b9d0483a621483b066b";
sha256 = "00rvb70s9wg9vqnsm6a63vakpjyznvpc4yplbmqjqa4dnfwp9kl2";
rev = "7eb33d2a6d5d574a43159da90e0eac2445367393";
sha256 = "0x6lji8s86vgih7fv9yvvjkyh9bqlzrsmn04im1zif087wa1dcw1";
};
meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/";
};
nvim-treesitter = buildVimPluginFrom2Nix {
pname = "nvim-treesitter";
version = "2023-02-03";
version = "2023-02-04";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter";
rev = "588cdb6c0652356dacc7d29bb4bb2b273df2df86";
sha256 = "087gdja192ziqzy3npz598l5yk0fly2n0g5748axsbbzb8l1a429";
rev = "bd7b4b6eff2dcb4a8a65f55d51398e79fa3d4ec6";
sha256 = "08amxr13yfqi2301lrdb0swl6wfjkbi3i7cq5r5ypyw7xaj1nbqb";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
};
@ -6503,23 +6527,23 @@ final: prev:
nvim-ts-rainbow2 = buildVimPluginFrom2Nix {
pname = "nvim-ts-rainbow2";
version = "2023-01-19";
version = "2023-02-04";
src = fetchgit {
url = "https://gitlab.com/HiPhish/nvim-ts-rainbow2";
rev = "2e0e2167f173df2f075fd52add2a0d6c66a2344a";
sha256 = "0z5w6y6ynv4q8rjcrfi2vklf9l9h5azda73ragqbfijkx9ggniyy";
rev = "7d33fb4402676723b0d7ca4d95717f5e020cd123";
sha256 = "0h4kfmh75p6c00f1xa6609y7zq9nm3p0r8yj17bwy30hpi51vnqv";
};
meta.homepage = "https://gitlab.com/HiPhish/nvim-ts-rainbow2";
};
nvim-web-devicons = buildVimPluginFrom2Nix {
pname = "nvim-web-devicons";
version = "2023-01-28";
version = "2023-02-04";
src = fetchFromGitHub {
owner = "nvim-tree";
repo = "nvim-web-devicons";
rev = "a421d183ef37dfa13f51a5805bed2381aebf9080";
sha256 = "0754m29aizcav7ynqflpbv3kzz2n7mw2xx8aliay3slzq18kix8d";
rev = "2b96193abe4372e18e4f4533895a42a466d53c17";
sha256 = "18vh5xpyzlmfwdz2n30fi7a6v7w5mnami857cczqy2bk5bc1xdvd";
};
meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/";
};
@ -6610,12 +6634,12 @@ final: prev:
oil-nvim = buildVimPluginFrom2Nix {
pname = "oil.nvim";
version = "2023-01-29";
version = "2023-02-03";
src = fetchFromGitHub {
owner = "stevearc";
repo = "oil.nvim";
rev = "716dd8f9cf1ff2b9cda03497025612ce3c366307";
sha256 = "14qydwhkr90w2bb1xza44pm2d1iiqmvijqik8qjs122i6z5hc7c6";
rev = "7371dd220f1d08789cc225846d8cafed938777e9";
sha256 = "0rcx62q9vrx0w6qgkpz39173r0fba6xk9ja212s93l3zwqp49wwb";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/stevearc/oil.nvim/";
@ -6996,12 +7020,12 @@ final: prev:
purescript-vim = buildVimPluginFrom2Nix {
pname = "purescript-vim";
version = "2022-12-07";
version = "2023-02-04";
src = fetchFromGitHub {
owner = "purescript-contrib";
repo = "purescript-vim";
rev = "7af25a840d38dc6767c85edd1f35c1f835618071";
sha256 = "1aw0bd0cx76ldm5nx17lqsxshlaiw8v9j0rwf1mlbz5k40c5v2w9";
rev = "9a01f01991ca52ae835da09f483aeeeb79639739";
sha256 = "0ix3gxh1d3iw9zjmw41yc3fk2dxz5xi5j0l7bn4xv7shbdpki1la";
};
meta.homepage = "https://github.com/purescript-contrib/purescript-vim/";
};
@ -7887,12 +7911,12 @@ final: prev:
switch-vim = buildVimPluginFrom2Nix {
pname = "switch.vim";
version = "2023-01-18";
version = "2023-02-03";
src = fetchFromGitHub {
owner = "AndrewRadev";
repo = "switch.vim";
rev = "9aa594704eb63b81477bf7547342a5cc4012ef80";
sha256 = "058nwj9rin11p9ifcl50i6ys5fv4v80kml4gnxqq89cd52sz07mh";
rev = "41fec8581f4816291481ab6c6e0516bf904d4a7a";
sha256 = "0gxipkigllr82gadgnhlhj4kk47131ykqac26zp6yxamgrnx43sq";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/AndrewRadev/switch.vim/";
@ -8226,12 +8250,12 @@ final: prev:
telescope-manix = buildVimPluginFrom2Nix {
pname = "telescope-manix";
version = "2023-01-23";
version = "2023-02-03";
src = fetchFromGitHub {
owner = "MrcJkb";
repo = "telescope-manix";
rev = "66feda7a276366edfc555cb0a7e56b8dd70aadc3";
sha256 = "1n4ygj3jhgqfg7xrh3hd56x14yqk6rdy3099hy8azbrx40zx0zdw";
rev = "28c0100c90dc200dd42471003d458fa8a2b71428";
sha256 = "0sd914iybjxrvfmakzw8wb6k97sjvw1nnmfli7a0wvrrbak562rk";
};
meta.homepage = "https://github.com/MrcJkb/telescope-manix/";
};
@ -8753,6 +8777,18 @@ final: prev:
meta.homepage = "https://github.com/chrisbra/unicode.vim/";
};
unison = buildVimPluginFrom2Nix {
pname = "unison";
version = "2023-02-03";
src = fetchFromGitHub {
owner = "unisonweb";
repo = "unison";
rev = "59acc0cbe429492a99bfebf2b783fc2fa3967f75";
sha256 = "1nrpxprq1f2pp269nrx18avv7ghngqlr7rjahib91rgkvhw6k1x7";
};
meta.homepage = "https://github.com/unisonweb/unison/";
};
unite-vim = buildVimPluginFrom2Nix {
pname = "unite.vim";
version = "2021-02-06";
@ -10507,12 +10543,12 @@ final: prev:
vim-go = buildVimPluginFrom2Nix {
pname = "vim-go";
version = "2023-02-03";
version = "2023-02-04";
src = fetchFromGitHub {
owner = "fatih";
repo = "vim-go";
rev = "7bf2074f340447c10b3af4ace96cc61e5f325693";
sha256 = "0ry67a7g0dpgaiwfcr79pgpw54x5v8dmfg4pypyd039ini0l0w46";
rev = "58437d8250cc3355b565725073f51ff0ff77cea6";
sha256 = "1fsrhyawry2m4dq7lrh1zvanxn2qi35lqg1al92w065sf62mds9z";
};
meta.homepage = "https://github.com/fatih/vim-go/";
};
@ -11121,12 +11157,12 @@ final: prev:
vim-ledger = buildVimPluginFrom2Nix {
pname = "vim-ledger";
version = "2023-02-03";
version = "2023-02-04";
src = fetchFromGitHub {
owner = "ledger";
repo = "vim-ledger";
rev = "ab78b1b16601274c1b93a43792080ef3faff06e9";
sha256 = "0k2h8508x6ga4gayrknrdqh6w5jhpf4vbz0ba8018264pnvz9fqd";
rev = "9b18bd548ec1fd6e94b262b3af0d9fb337c0b1df";
sha256 = "1paqjvvrcgngpggwa2a57d85xzvz5g5mk43bzn5fkgc1xfd77yv1";
};
meta.homepage = "https://github.com/ledger/vim-ledger/";
};
@ -13993,12 +14029,12 @@ final: prev:
chad = buildVimPluginFrom2Nix {
pname = "chad";
version = "2023-02-02";
version = "2023-02-03";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "chadtree";
rev = "e82eb7f40313a52f80e2e14e6d8b5d014c83b053";
sha256 = "02p7fvbampijqbkbjfq74hjm7h1ak6p5m6w5pv9askfc4vw0mcnj";
rev = "baae8d0a8afb062f5be6d83189e626dd74f41f98";
sha256 = "024iis733yvvkqil2m0wxh7lpkz0j7ij2if4yds07izbyyrpdxg6";
};
meta.homepage = "https://github.com/ms-jpq/chadtree/";
};
@ -14017,12 +14053,12 @@ final: prev:
embark-vim = buildVimPluginFrom2Nix {
pname = "embark-vim";
version = "2022-09-12";
version = "2023-02-03";
src = fetchFromGitHub {
owner = "embark-theme";
repo = "vim";
rev = "96fdfff7dac84dda937d843a0aceb1c39acba761";
sha256 = "1yms82s3iwis6lk5h1kapa9vlhlhbk1kqxlywlvvy6kz7d1iyvjj";
rev = "89a044730bf5402c49db03475a9fa56782ca9d1c";
sha256 = "0d7956wi0lcbimxbn5cmghw11vb8gfsg2pd6yr4xja6bb4ldlbrk";
};
meta.homepage = "https://github.com/embark-theme/vim/";
};
@ -14041,12 +14077,12 @@ final: prev:
lspsaga-nvim-original = buildVimPluginFrom2Nix {
pname = "lspsaga-nvim-original";
version = "2023-02-03";
version = "2023-02-04";
src = fetchFromGitHub {
owner = "glepnir";
repo = "lspsaga.nvim";
rev = "a2e3f7cf76f4cb102d3fc165bd8c9a565053e84f";
sha256 = "1d0ha7pjjzbhvkcn0z1dgnz2r3jkviad0hipvcw1xy5jnnym4sm5";
rev = "9a7013874a9d5e0413039fc9ded613fcdbd59cbd";
sha256 = "1n9dkd6wlghw1b011xnja2h36l68x5pi3cf7f4khw7zfk0f49r1k";
};
meta.homepage = "https://github.com/glepnir/lspsaga.nvim/";
};

52
pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
View File

@ -135,6 +135,17 @@
};
meta.homepage = "https://github.com/amaanq/tree-sitter-capnp";
};
chatito = buildGrammar {
language = "chatito";
version = "3baf22e";
src = fetchFromGitHub {
owner = "ObserverOfTime";
repo = "tree-sitter-chatito";
rev = "3baf22e7e507cedf15d1dbc03df8afa50a625586";
hash = "sha256-NsdkvMkrHfVakeYxPJfr4HOg5BlLB6OPFQeMseQQL/k=";
};
meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-chatito";
};
clojure = buildGrammar {
language = "clojure";
version = "262d6d6";
@ -459,12 +470,12 @@
};
gdscript = buildGrammar {
language = "gdscript";
version = "a8fa839";
version = "4849e65";
src = fetchFromGitHub {
owner = "PrestonKnopp";
repo = "tree-sitter-gdscript";
rev = "a8fa839150d05baaf4d5a472520ee71e9b1d8b3c";
hash = "sha256-uSpic8MKMvl1p7LOHNn5EJGp1iOYkeqcRt7skdROmBo=";
rev = "4849e657b98945cd040ffa7fd833d6130259dbab";
hash = "sha256-Rs1W2jahp+J42JzICi+QLAqfHYXth47g4LjejJnJypo=";
};
meta.homepage = "https://github.com/PrestonKnopp/tree-sitter-gdscript";
};
@ -580,6 +591,17 @@
};
meta.homepage = "https://github.com/camdencheek/tree-sitter-go-mod";
};
gosum = buildGrammar {
language = "gosum";
version = "68974b6";
src = fetchFromGitHub {
owner = "amaanq";
repo = "tree-sitter-go-sum";
rev = "68974b63c19dc6e27214a5c76b6e26c0c40fe5b7";
hash = "sha256-Avk9nAICwy59VYIlLhp9FkozAna9kMwY60pAqKyJsK4=";
};
meta.homepage = "https://github.com/amaanq/tree-sitter-go-sum";
};
gowork = buildGrammar {
language = "gowork";
version = "949a8a4";
@ -824,12 +846,12 @@
};
julia = buildGrammar {
language = "julia";
version = "9d36818";
version = "e2f449e";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-julia";
rev = "9d368185be7e8139f2eda93d8b0acc2a54031718";
hash = "sha256-6jKiqDo8fSHrUGFIizNSKWoB0CVXJv6b3XfN9YjNLJc=";
rev = "e2f449e2bcc95f1d07ceb62d67f986005f73a6be";
hash = "sha256-ZXnEvHtheP8rI/lwPf94lVCF5S5rw38bewuZ0GHxjr8=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-julia";
};
@ -1302,12 +1324,12 @@
};
ruby = buildGrammar {
language = "ruby";
version = "7a1921b";
version = "206c707";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-ruby";
rev = "7a1921bcfd90e3a04c1ad011059087aaf0168dd4";
hash = "sha256-niL8gqKv1Nq1z8y4c49amqkDo+FoIP3XEJz+dV2UmWo=";
rev = "206c7077164372c596ffa8eaadb9435c28941364";
hash = "sha256-1kQ3RP2lJ0vwvVmKAQYNyPjltEKZLiZ4iI8iIxcRGd8=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-ruby";
};
@ -1412,12 +1434,12 @@
};
sql = buildGrammar {
language = "sql";
version = "30e15d4";
version = "c508e60";
src = fetchFromGitHub {
owner = "derekstride";
repo = "tree-sitter-sql";
rev = "30e15d45dceb24ea51acf81ee7d75d81567b6e02";
hash = "sha256-s8jeS8FRDPQQ9Iq0Vi12GrshM/E8opdPI0Xxre5oL0I=";
rev = "c508e6044adf4298d7b321f966c90cbe32d75d23";
hash = "sha256-Ed+6pwxwvwLKOVB9XVHF+IftEiO4bG0yZAe77xBcazI=";
};
generate = true;
meta.homepage = "https://github.com/derekstride/tree-sitter-sql";
@ -1728,12 +1750,12 @@
};
zig = buildGrammar {
language = "zig";
version = "d90d38d";
version = "b0693dd";
src = fetchFromGitHub {
owner = "maxxnino";
repo = "tree-sitter-zig";
rev = "d90d38d28ce8cc27bfea8b4e0c75211e9e2398ca";
hash = "sha256-vdfXC9PUyv4YynfrKi7M708zFbNIV6AERBd63/EAp1A=";
rev = "b0693dd473efd91d6085acd8e0ff9c627d37e077";
hash = "sha256-Jmz2XDI+mrBYE2TEhxPJZbICbhs5AOC0tyC4OOgT61U=";
};
meta.homepage = "https://github.com/maxxnino/tree-sitter-zig";
};

7
pkgs/applications/editors/vim/plugins/overrides.nix
View File

@ -116,7 +116,7 @@
self: super: {
barbecue-nvim = super.vimshell-vim.overrideAttrs (old: {
barbecue-nvim = super.barbecue-nvim.overrideAttrs (old: {
dependencies = with self; [ nvim-lspconfig nvim-navic nvim-web-devicons ];
meta = {
description = "A VS Code like winbar for Neovim";
@ -991,6 +991,11 @@ self: super: {
'';
});
unison = super.unison.overrideAttrs (old: {
# Editor stuff isn't at top level
postPatch = "cd editor-support/vim";
});
vCoolor-vim = super.vCoolor-vim.overrideAttrs (old: {
# on linux can use either Zenity or Yad.
propagatedBuildInputs = [ gnome.zenity ];

3
pkgs/applications/editors/vim/plugins/vim-plugin-names
View File

@ -325,6 +325,7 @@ https://github.com/nishigori/increment-activator/,,
https://github.com/haya14busa/incsearch-easymotion.vim/,,
https://github.com/haya14busa/incsearch.vim/,,
https://github.com/lukas-reineke/indent-blankline.nvim/,,
https://github.com/Darazaki/indent-o-matic/,,
https://github.com/Yggdroot/indentLine/,,
https://github.com/ciaranm/inkpot/,,
https://github.com/jbyuki/instant.nvim/,HEAD,
@ -441,6 +442,7 @@ https://github.com/folke/neoconf.nvim/,HEAD,
https://github.com/KeitaNakamura/neodark.vim/,,
https://github.com/folke/neodev.nvim/,HEAD,
https://github.com/sbdchd/neoformat/,,
https://github.com/danymat/neogen/,HEAD,
https://github.com/TimUntersberger/neogit/,,
https://github.com/Shougo/neoinclude.vim/,,
https://github.com/neomake/neomake/,,
@ -734,6 +736,7 @@ https://github.com/leafgarland/typescript-vim/,,
https://github.com/SirVer/ultisnips/,,
https://github.com/mbbill/undotree/,,
https://github.com/chrisbra/unicode.vim/,,
https://github.com/unisonweb/unison/,,
https://github.com/Shougo/unite.vim/,,
https://github.com/axieax/urlview.nvim/,,
https://github.com/vim-scripts/utl.vim/,,

6
pkgs/applications/emulators/wine/base.nix
View File

@ -4,7 +4,6 @@
autoconf, hexdump, perl, nixosTests,
supportFlags,
patches,
vkd3dArches,
moltenvk,
buildScript ? null, configureFlags ? [], mainProgram ? "wine"
}:
@ -71,7 +70,6 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) {
++ lib.optional cupsSupport pkgs.cups
++ lib.optional gettextSupport pkgs.gettext
++ lib.optional dbusSupport pkgs.dbus
++ lib.optional openalSupport pkgs.openal
++ lib.optional cairoSupport pkgs.cairo
++ lib.optional odbcSupport pkgs.unixODBC
++ lib.optional netapiSupport pkgs.samba4
@ -82,7 +80,6 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) {
++ lib.optional saneSupport pkgs.sane-backends
++ lib.optional gphoto2Support pkgs.libgphoto2
++ lib.optional krb5Support pkgs.libkrb5
++ lib.optional ldapSupport pkgs.openldap
++ lib.optional fontconfigSupport pkgs.fontconfig
++ lib.optional alsaSupport pkgs.alsa-lib
++ lib.optional pulseaudioSupport pkgs.libpulseaudio
@ -91,7 +88,6 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) {
++ lib.optional vulkanSupport (if stdenv.isDarwin then moltenvk else pkgs.vulkan-loader)
++ lib.optional sdlSupport pkgs.SDL2
++ lib.optional usbSupport pkgs.libusb1
++ vkd3dArches
++ lib.optionals gstreamerSupport (with pkgs.gst_all_1;
[ gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-libav
(gst-plugins-bad.override { enableZbar = false; }) ])
@ -101,7 +97,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) {
++ lib.optionals (openglSupport && !stdenv.isDarwin) [ pkgs.libGLU pkgs.libGL pkgs.mesa.osmesa pkgs.libdrm ]
++ lib.optionals stdenv.isDarwin (with pkgs.buildPackages.darwin.apple_sdk.frameworks; [
CoreServices Foundation ForceFeedback AppKit OpenGL IOKit DiskArbitration Security
ApplicationServices AudioToolbox CoreAudio AudioUnit CoreMIDI OpenAL OpenCL Cocoa Carbon
ApplicationServices AudioToolbox CoreAudio AudioUnit CoreMIDI OpenCL Cocoa Carbon
])
++ lib.optionals (stdenv.isLinux && !waylandSupport) (with pkgs.xorg; [
libX11 libXi libXcursor libXrandr libXrender libXxf86vm libXcomposite libXext

9
pkgs/applications/emulators/wine/default.nix
View File

@ -18,7 +18,6 @@
gstreamerSupport ? false,
cupsSupport ? false,
dbusSupport ? false,
openalSupport ? false,
openclSupport ? false,
cairoSupport ? false,
odbcSupport ? false,
@ -30,13 +29,11 @@
saneSupport ? false,
gphoto2Support ? false,
krb5Support ? false,
ldapSupport ? false,
pulseaudioSupport ? false,
udevSupport ? false,
xineramaSupport ? false,
vulkanSupport ? false,
sdlSupport ? false,
vkd3dSupport ? false,
usbSupport ? false,
mingwSupport ? wineRelease != "stable",
waylandSupport ? wineRelease == "wayland",
@ -49,12 +46,12 @@ let wine-build = build: release:
wineRelease = release;
supportFlags = {
inherit
cupsSupport gettextSupport dbusSupport openalSupport cairoSupport
cupsSupport gettextSupport dbusSupport cairoSupport
odbcSupport netapiSupport cursesSupport vaSupport pcapSupport
v4lSupport saneSupport gphoto2Support krb5Support ldapSupport fontconfigSupport
v4lSupport saneSupport gphoto2Support krb5Support fontconfigSupport
alsaSupport pulseaudioSupport xineramaSupport gtkSupport openclSupport
tlsSupport openglSupport gstreamerSupport udevSupport vulkanSupport
sdlSupport usbSupport vkd3dSupport mingwSupport waylandSupport embedInstallers;
sdlSupport usbSupport mingwSupport waylandSupport embedInstallers;
};
inherit moltenvk;
});

5
pkgs/applications/emulators/wine/packages.nix
View File

@ -5,14 +5,11 @@
let
src = lib.getAttr wineRelease (callPackage ./sources.nix {});
vkd3d = pkgs.callPackage ./vkd3d.nix { inherit moltenvk; };
vkd3d_i686 = pkgsi686Linux.callPackage ./vkd3d.nix { inherit moltenvk; };
in with src; {
wine32 = pkgsi686Linux.callPackage ./base.nix {
pname = "wine";
inherit src version supportFlags patches moltenvk;
pkgArches = [ pkgsi686Linux ];
vkd3dArches = lib.optionals supportFlags.vkd3dSupport [ vkd3d_i686 ];
geckos = [ gecko32 ];
mingwGccs = with pkgsCross; [ mingw32.buildPackages.gcc ];
monos = [ mono ];
@ -22,7 +19,6 @@ in with src; {
pname = "wine64";
inherit src version supportFlags patches moltenvk;
pkgArches = [ pkgs ];
vkd3dArches = lib.optionals supportFlags.vkd3dSupport [ vkd3d ];
mingwGccs = with pkgsCross; [ mingwW64.buildPackages.gcc ];
geckos = [ gecko64 ];
monos = [ mono ];
@ -35,7 +31,6 @@ in with src; {
inherit src version supportFlags patches moltenvk;
stdenv = stdenv_32bit;
pkgArches = [ pkgs pkgsi686Linux ];
vkd3dArches = lib.optionals supportFlags.vkd3dSupport [ vkd3d vkd3d_i686 ];
geckos = [ gecko32 gecko64 ];
mingwGccs = with pkgsCross; [ mingw32.buildPackages.gcc mingwW64.buildPackages.gcc ];
monos = [ mono ];

58
pkgs/applications/emulators/wine/sources.nix
View File

@ -1,17 +1,17 @@
{ pkgs ? import <nixpkgs> {} }:
## we default to importing <nixpkgs> here, so that you can use
## a simple shell command to insert new sha256's into this file
## a simple shell command to insert new hashes into this file
## e.g. with emacs C-u M-x shell-command
##
## nix-prefetch-url sources.nix -A {stable{,.mono,.gecko64,.gecko32}, unstable, staging, winetricks}
# here we wrap fetchurl and fetchFromGitHub, in order to be able to pass additional args around it
let fetchurl = args@{url, sha256, ...}:
pkgs.fetchurl { inherit url sha256; } // args;
fetchFromGitHub = args@{owner, repo, rev, sha256, ...}:
pkgs.fetchFromGitHub { inherit owner repo rev sha256; } // args;
fetchFromGitLab = args@{domain, owner, repo, rev, sha256, ...}:
pkgs.fetchFromGitLab { inherit domain owner repo rev sha256; } // args;
let fetchurl = args@{url, hash, ...}:
pkgs.fetchurl { inherit url hash; } // args;
fetchFromGitHub = args@{owner, repo, rev, hash, ...}:
pkgs.fetchFromGitHub { inherit owner repo rev hash; } // args;
fetchFromGitLab = args@{domain, owner, repo, rev, hash, ...}:
pkgs.fetchFromGitLab { inherit domain owner repo rev hash; } // args;
updateScriptPreamble = ''
set -eou pipefail
@ -24,27 +24,27 @@ let fetchurl = args@{url, sha256, ...}:
in rec {
stable = fetchurl rec {
version = "7.0.1";
url = "https://dl.winehq.org/wine/source/7.0/wine-${version}.tar.xz";
sha256 = "sha256-gHyqeBIbFiUPJA0oKKB8pOPGCXOeVSTvD0z4muSagWw=";
version = "8.0";
url = "https://dl.winehq.org/wine/source/8.0/wine-${version}.tar.xz";
hash = "sha256-AnLCCTj4chrkUQr6qLNgN0V91XZh5NZkIxB5uekceS4=";
## see http://wiki.winehq.org/Gecko
gecko32 = fetchurl rec {
version = "2.47.3";
url = "https://dl.winehq.org/wine/wine-gecko/${version}/wine-gecko-${version}-x86.msi";
sha256 = "sha256-5bmwbTzjVWRqjS5y4ETjfh4MjRhGTrGYWtzRh6f0jgE=";
hash = "sha256-5bmwbTzjVWRqjS5y4ETjfh4MjRhGTrGYWtzRh6f0jgE=";
};
gecko64 = fetchurl rec {
version = "2.47.3";
url = "https://dl.winehq.org/wine/wine-gecko/${version}/wine-gecko-${version}-x86_64.msi";
sha256 = "sha256-pT7pVDkrbR/j1oVF9uTiqXr7yNyLA6i0QzSVRc4TlnU=";
hash = "sha256-pT7pVDkrbR/j1oVF9uTiqXr7yNyLA6i0QzSVRc4TlnU=";
};
## see http://wiki.winehq.org/Mono
mono = fetchurl rec {
version = "7.0.0";
version = "7.4.0";
url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi";
sha256 = "sha256-s35vyeWQ5YIkPcJdcqX8wzDDp5cN/cmKeoHSOEW6iQA=";
hash = "sha256-ZBP/Mo679+x2icZI/rNUbYEC3thlB50fvwMxsUs6sOw=";
};
patches = [
@ -54,14 +54,14 @@ in rec {
updateScript = writeShellScript "update-wine-stable" (''
${updateScriptPreamble}
major=''${UPDATE_NIX_OLD_VERSION%.*}
major=''${UPDATE_NIX_OLD_VERSION%%.*}
latest_stable=$(get_latest_wine_version "$major.0")
latest_gecko=$(get_latest_lib_version wine-gecko)
# Can't use autobump on stable because we don't want the path
# <source/7.0/wine-7.0.tar.xz> to become <source/7.0.1/wine-7.0.1.tar.xz>.
if [[ "$UPDATE_NIX_OLD_VERSION" != "$latest_stable" ]]; then
set_version_and_sha256 stable "$latest_stable" "$(nix-prefetch-url "$wine_url_base/source/$major.0/wine-$latest_stable.tar.xz")"
set_version_and_hash stable "$latest_stable" "$(nix-prefetch-url "$wine_url_base/source/$major.0/wine-$latest_stable.tar.xz")"
fi
autobump stable.gecko32 "$latest_gecko"
@ -72,27 +72,27 @@ in rec {
};
unstable = fetchurl rec {
# NOTE: Don't forget to change the SHA256 for staging as well.
version = "7.20";
url = "https://dl.winehq.org/wine/source/7.x/wine-${version}.tar.xz";
sha256 = "sha256-dRt58itan3LJ7BX3VbALE9PtBz6RaMPvStq9nbN9DVA=";
# NOTE: Don't forget to change the hash for staging as well.
version = "8.1";
url = "https://dl.winehq.org/wine/source/8.x/wine-${version}.tar.xz";
hash = "sha256-QSDuaz8pTZeq8scwNM8cLL8ToZXJTFx0pkaoH5JBJZg=";
inherit (stable) gecko32 gecko64 patches;
mono = fetchurl rec {
version = "7.4.0";
url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi";
sha256 = "sha256-ZBP/Mo679+x2icZI/rNUbYEC3thlB50fvwMxsUs6sOw=";
hash = "sha256-ZBP/Mo679+x2icZI/rNUbYEC3thlB50fvwMxsUs6sOw=";
};
updateScript = writeShellScript "update-wine-unstable" ''
${updateScriptPreamble}
major=''${UPDATE_NIX_OLD_VERSION%.*}
major=''${UPDATE_NIX_OLD_VERSION%%.*}
latest_unstable=$(get_latest_wine_version "$major.x")
latest_mono=$(get_latest_lib_version wine-mono)
update_staging() {
staging_url=$(get_source_attr staging.url)
set_source_attr staging sha256 "\"$(to_sri "$(nix-prefetch-url --unpack "''${staging_url//$1/$2}")")\""
set_source_attr staging hash "\"$(to_sri "$(nix-prefetch-url --unpack "''${staging_url//$1/$2}")")\""
}
autobump unstable "$latest_unstable" "" update_staging
@ -105,7 +105,7 @@ in rec {
staging = fetchFromGitHub rec {
# https://github.com/wine-staging/wine-staging/releases
inherit (unstable) version;
sha256 = "sha256-yzZE06FBoPL65+m8MrKlmW5cSIcX3dZYAOY9wjEJaJw=";
hash = "sha256-5AzXXaRGyvfYxd3yXtAlZREv1wp6UqWdDRdnwmKVaUg=";
owner = "wine-staging";
repo = "wine-staging";
rev = "v${version}";
@ -115,12 +115,12 @@ in rec {
wayland = fetchFromGitLab rec {
# https://gitlab.collabora.com/alf/wine/-/tree/wayland
version = "7.20";
sha256 = "sha256-UrukAnlfrr6eeVwFSEOWSVSfyMHbMT1o1tfXxow61xY=";
version = "8.0";
hash = "sha256-whRnm21UyKZ4AQufNmctzivISVobnCeidmpYz65vlyk=";
domain = "gitlab.collabora.com";
owner = "alf";
repo = "wine";
rev = "1dc9821ef0b6109c74d0c95cd5418caf7f9feaf1";
rev = "2f80bd757739f2dd8da41abceae6b87d2c568152";
inherit (unstable) gecko32 gecko64;
@ -135,7 +135,7 @@ in rec {
if [[ "$wayland_rev" != "$latest_wayland_rev" ]]; then
latest_wayland=$(curl -s 'https://gitlab.collabora.com/alf/wine/-/raw/wayland/VERSION' | cut -f3 -d' ')
wayland_url=$(get_source_attr wayland.url)
set_version_and_sha256 wayland "$latest_wayland" "$(nix-prefetch-url --unpack "''${wayland_url/$wayland_rev/$latest_wayland_rev}")"
set_version_and_hash wayland "$latest_wayland" "$(nix-prefetch-url --unpack "''${wayland_url/$wayland_rev/$latest_wayland_rev}")"
set_source_attr wayland rev "\"$latest_wayland_rev\""
fi
@ -146,7 +146,7 @@ in rec {
winetricks = fetchFromGitHub rec {
# https://github.com/Winetricks/winetricks/releases
version = "20220411";
sha256 = "sha256-FjH10nZDYbqXI6/vKpZJKfv2maXSVkahNDf5UTU3eyU=";
hash = "sha256-FjH10nZDYbqXI6/vKpZJKfv2maXSVkahNDf5UTU3eyU=";
owner = "Winetricks";
repo = "winetricks";
rev = version;

6
pkgs/applications/emulators/wine/update-lib.sh
View File

@ -14,9 +14,9 @@ set_source_attr() {
sed_exprs+=(-e "${line}s@[^ ].*\$@$name = $value;@")
}
set_version_and_sha256() {
set_version_and_hash() {
set_source_attr "$1" version "\"$2\""
set_source_attr "$1" sha256 "\"$(to_sri "$3")\""
set_source_attr "$1" hash "\"$(to_sri "$3")\""
}
get_latest_wine_version() {
@ -39,7 +39,7 @@ autobump() {
version=$(get_source_attr "$attr.version")
if [[ "$version" != "$latest" ]]; then
url=$(get_source_attr "$attr.url")
set_version_and_sha256 "$attr" "$latest" "$($fetcher "${url//$version/$latest}")"
set_version_and_hash "$attr" "$latest" "$($fetcher "${url//$version/$latest}")"
[[ -z "$more" ]] || $more "$version" "$latest"
fi
}

28
pkgs/applications/emulators/wine/vkd3d.nix
View File

@ -1,28 +0,0 @@
{ lib, stdenv, fetchurl, moltenvk, vulkan-headers, spirv-headers, vulkan-loader, flex, bison }:
#TODO: unstable
stdenv.mkDerivation rec {
pname = "vkd3d";
version = "1.5";
src = fetchurl {
url = "https://dl.winehq.org/vkd3d/source/vkd3d-${version}.tar.xz";
sha256 = "sha256-47PDVfRvfL/BnnEKR4vLK+4mel82Dn5kBiOM6lLOLPw=";
};
nativeBuildInputs = [ flex bison ];
buildInputs = [ vulkan-headers spirv-headers ]
++ [ (if stdenv.isDarwin then moltenvk else vulkan-loader) ];
enableParallelBuilding = true;
meta = with lib; {
description = "A 3d library build on top on Vulkan with a similar api to DirectX 12";
homepage = "https://source.winehq.org/git/vkd3d.git";
license = licenses.lgpl21;
platforms = platforms.unix;
maintainers = [ maintainers.marius851000 ];
};
}

70
pkgs/applications/finance/denaro/default.nix Normal file
View File

@ -0,0 +1,70 @@
{ lib
, stdenvNoCC
, buildDotnetModule
, fetchFromGitHub
, fetchpatch
, dotnetCorePackages
, gtk4
, libadwaita
, pkg-config
, wrapGAppsHook4
, glib
, shared-mime-info
, python3
, desktop-file-utils
, gdk-pixbuf
}:
buildDotnetModule rec {
pname = "denaro";
version = "2023.1.1";
src = fetchFromGitHub {
owner = "nlogozzo";
repo = "NickvisionMoney";
rev = version;
hash = "sha256-U6/laqmOS7ZUhgCCHggIn1U3GyQ/wy05XuCcqc7gtVQ=";
};
dotnet-sdk = dotnetCorePackages.sdk_7_0;
dotnet-runtime = dotnetCorePackages.runtime_7_0;
projectFile = "NickvisionMoney.GNOME/NickvisionMoney.GNOME.csproj";
nugetDeps = ./deps.nix;
executables = "NickvisionMoney.GNOME";
# Prevent installing native libraries for all platforms
dotnetBuildFlags = [ "--runtime" (dotnetCorePackages.systemToDotnetRid stdenvNoCC.hostPlatform.system) ];
dotnetInstallFlags = [ "--runtime" (dotnetCorePackages.systemToDotnetRid stdenvNoCC.hostPlatform.system) ];
nativeBuildInputs = [
pkg-config
wrapGAppsHook4
glib # For glib-compile-resources
shared-mime-info # For update-mime-database
python3
desktop-file-utils
gdk-pixbuf # Fixes icon missing in envs where GDK_PIXBUF_MODULE_FILE is not set
];
postInstall = ''
sh NickvisionMoney.GNOME/install_extras.sh $out
desktop-file-edit $out/share/applications/org.nickvision.money.desktop \
--set-key=Exec --set-value=$out/bin/NickvisionMoney.GNOME
'';
runtimeDeps = [
gtk4
libadwaita
glib # Fixes "Could not retrieve parent type - is the typeid valid?"
];
meta = with lib; {
description = "Personal finance manager for GNOME";
homepage = "https://github.com/nlogozzo/NickvisionMoney";
mainProgram = "NickvisionMoney.GNOME";
license = licenses.mit;
maintainers = with maintainers; [ chuangzhu ];
platforms = platforms.linux;
};
}

40
pkgs/applications/finance/denaro/deps.nix generated Normal file
View File

@ -0,0 +1,40 @@
# This file was automatically generated by passthru.fetch-deps.
# Please dont edit it manually, your changes might get overwritten!
{ fetchNuGet }: [
(fetchNuGet { pname = "Docnet.Core"; version = "2.3.1"; sha256 = "03b39x0vlymdknwgwhsmnpw4gj3njmbl9pd57ls3rhfn9r832d44"; })
(fetchNuGet { pname = "GirCore.Adw-1"; version = "0.2.0"; sha256 = "1lvyw61kcjq9m6iaw7c7xfjk1b99ccsh79819qnigdi37p7dgb7y"; })
(fetchNuGet { pname = "GirCore.Cairo-1.0"; version = "0.2.0"; sha256 = "14jr3476h3lr3s0iahyf9in96631h7b8g36wpfgr0gz6snic6ch1"; })
(fetchNuGet { pname = "GirCore.FreeType2-2.0"; version = "0.2.0"; sha256 = "0as1iknxx8vd5c0snf3bssij20fy74dbzaqbq60djf7v4c5q46nq"; })
(fetchNuGet { pname = "GirCore.Gdk-4.0"; version = "0.2.0"; sha256 = "19rh6mm2zxg46gdnizic4v6pmdk2hx25r4k12r8z4mkbmzpmcaaf"; })
(fetchNuGet { pname = "GirCore.GdkPixbuf-2.0"; version = "0.2.0"; sha256 = "11v4zplb7flh24vn1pralanzjm9jlnmx8r867ihvzj73mphmzs6m"; })
(fetchNuGet { pname = "GirCore.Gio-2.0"; version = "0.2.0"; sha256 = "0489ba4gw6wq1ndlrhfi7pmnifvnhq52p0riih60lrhgi3664ybc"; })
(fetchNuGet { pname = "GirCore.GLib-2.0"; version = "0.2.0"; sha256 = "0ms6gbrrinznhvs15mhfm3xh4zlqv5j4sw2zgajisiiprdzh2rcz"; })
(fetchNuGet { pname = "GirCore.GObject-2.0"; version = "0.2.0"; sha256 = "17qk1zhvfmmywndv2n6d3hg0gs1cwmxlmsns5ink7g8prwfp0vpf"; })
(fetchNuGet { pname = "GirCore.Graphene-1.0"; version = "0.2.0"; sha256 = "0gkj37rrazksvyc4nq3scmch7mxlcj40w8kwsmfvmvyl58z2faq7"; })
(fetchNuGet { pname = "GirCore.Gsk-4.0"; version = "0.2.0"; sha256 = "0qxw84hl40rbgjcxwx4rhmi4dif519kbdypazl2laz14pirh0b8v"; })
(fetchNuGet { pname = "GirCore.Gtk-4.0"; version = "0.2.0"; sha256 = "1klskbfkaaqy5asy83hbgb64pziib63s6d0szx3i3z24ynwhqjp3"; })
(fetchNuGet { pname = "GirCore.HarfBuzz-0.0"; version = "0.2.0"; sha256 = "03vp892bzy3nm5x35aqg8ripkw2n9gc86fqm3pr9fa1l88dhbqnl"; })
(fetchNuGet { pname = "GirCore.Pango-1.0"; version = "0.2.0"; sha256 = "158bsyirbdzyxnyphgzl8p6mxw1f9xbjpd92aijxk4hwdjvgn9hn"; })
(fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2.3"; sha256 = "115aybicqs9ijjlcv6k6r5v0agkjm1bm1nkd0rj3jglv8s0xvmp2"; })
(fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "2.8.2.3"; sha256 = "1f18ahwkaginrg0vwsi6s56lvnqvvxv7pzklfs5lnknasxy1a76z"; })
(fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2.3"; sha256 = "052d8frpkj4ijs6fm6xp55xbv95b1s9biqwa0w8zp3rgm88m9236"; })
(fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2.3"; sha256 = "08khd2jqm8sw58ljz5srangzfm2sz3gd2q1jzc5fr80lj8rv6r74"; })
(fetchNuGet { pname = "Microsoft.Data.Sqlite"; version = "7.0.1"; sha256 = "1abakjiljrh0jabdk2bdgbi7lwzrzxmkkd8p5sm67xm5f4ni8db5"; })
(fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; version = "7.0.1"; sha256 = "1vkgng2rmpmazklwd9gnyrdngjf2n8bdm2y55njzny2fwpdy82rq"; })
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; })
(fetchNuGet { pname = "QuestPDF"; version = "2022.12.0"; sha256 = "0hkcw871jm77jqbgnbxixd5nxpxzzz0jcr61adsry2b15ymzmkb1"; })
(fetchNuGet { pname = "SixLabors.ImageSharp"; version = "2.1.3"; sha256 = "12qb0r7v2v91vw8q8ygr67y527gwhbas6d6zdvrv4ksxwjx9dzp9"; })
(fetchNuGet { pname = "SkiaSharp"; version = "2.88.3"; sha256 = "1yq694myq2rhfp2hwwpyzcg1pzpxcp7j72wib8p9pw9dfj7008sv"; })
(fetchNuGet { pname = "SkiaSharp.HarfBuzz"; version = "2.88.3"; sha256 = "0axz2zfyg0h3zis7rr86ikrm2jbxxy0gqb3bbawpgynf1k0fsi6a"; })
(fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.3"; sha256 = "0dajvr60nwvnv7s6kcqgw1w97zxdpz1c5lb7kcq7r0hi0l05ck3q"; })
(fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.3"; sha256 = "191ajgi6fnfqcvqvkayjsxasiz6l0bv3pps8vv9abbyc4b12qvph"; })
(fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.3"; sha256 = "03wwfbarsxjnk70qhqyd1dw65098dncqk2m0vksx92j70i7lry6q"; })
(fetchNuGet { pname = "SQLitePCLRaw.bundle_e_sqlite3"; version = "2.1.2"; sha256 = "07rc4pj3rphi8nhzkcvilnm0fv27qcdp68jdwk4g0zjk7yfvbcay"; })
(fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.2"; sha256 = "19hxv895lairrjmk4gkzd3mcb6b0na45xn4n551h4kckplqadg3d"; })
(fetchNuGet { pname = "SQLitePCLRaw.lib.e_sqlite3"; version = "2.1.2"; sha256 = "0jn98bkjk8h4smi09z31ib6s6392054lwmkziqmkqf5gf614k2fz"; })
(fetchNuGet { pname = "SQLitePCLRaw.provider.e_sqlite3"; version = "2.1.2"; sha256 = "0bnm2fhvcsyg5ry74gal2cziqnyf5a8d2cb491vsa7j41hbbx7kv"; })
(fetchNuGet { pname = "System.Memory"; version = "4.5.3"; sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; })
(fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "5.0.0"; sha256 = "02k25ivn50dmqx5jn8hawwmz24yf0454fjd823qk6lygj9513q4x"; })
(fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "5.0.0"; sha256 = "1bn2pzaaq4wx9ixirr8151vm5hynn3lmrljcgjx9yghmm4k677k0"; })
]

4
pkgs/applications/graphics/ImageMagick/default.nix
View File

@ -46,13 +46,13 @@ in
stdenv.mkDerivation rec {
pname = "imagemagick";
version = "7.1.0-57";
version = "7.1.0-60";
src = fetchFromGitHub {
owner = "ImageMagick";
repo = "ImageMagick";
rev = version;
hash = "sha256-1fFsrsrY8AAMr6miG8OPZIYaVZhtVi5kEaI/96dzip8=";
hash = "sha256-dQfmW9rt66eWOaKbZ9j8jc1k8v+F8B9TpTx12L+0VE4=";
};
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big

4
pkgs/applications/graphics/krita/generic.nix
View File

@ -2,7 +2,7 @@
, karchive, kconfig, kwidgetsaddons, kcompletion, kcoreaddons
, kguiaddons, ki18n, kitemmodels, kitemviews, kwindowsystem
, kio, kcrash, breeze-icons
, boost, libraw, fftw, eigen, exiv2, libheif, lcms2, gsl, openexr, giflib
, boost, libraw, fftw, eigen, exiv2, libheif, lcms2, gsl, openexr, giflib, libjxl
, openjpeg, opencolorio_1, xsimd, poppler, curl, ilmbase, libmypaint, libwebp
, qtmultimedia, qtx11extras, quazip
, python3Packages
@ -26,7 +26,7 @@ mkDerivation rec {
buildInputs = [
karchive kconfig kwidgetsaddons kcompletion kcoreaddons kguiaddons
ki18n kitemmodels kitemviews kwindowsystem kio kcrash breeze-icons
boost libraw fftw eigen exiv2 lcms2 gsl openexr libheif giflib
boost libraw fftw eigen exiv2 lcms2 gsl openexr libheif giflib libjxl
openjpeg opencolorio_1 poppler curl ilmbase libmypaint libwebp
qtmultimedia qtx11extras quazip
python3Packages.pyqt5

5
pkgs/applications/graphics/vkdt/default.nix
View File

@ -23,11 +23,11 @@
stdenv.mkDerivation rec {
pname = "vkdt";
version = "0.5.3";
version = "0.5.4";
src = fetchurl {
url = "https://github.com/hanatos/${pname}/releases/download/${version}/${pname}-${version}.tar.xz";
sha256 = "sha256-7b9mowMOdA4holdb5zUIqOGkB0/xB6AvJOfxA6IIfRc=";
sha256 = "sha256-lyljfJ4RZETEED4bofC/Rq88PMNhoHO1kgHmmaXPuhM=";
};
strictDeps = true;
@ -67,6 +67,5 @@ stdenv.mkDerivation rec {
license = licenses.bsd2;
maintainers = with maintainers; [ paperdigits ];
platforms = platforms.linux;
broken = stdenv.isAarch64;
};
}

7
pkgs/applications/misc/diffuse/default.nix
View File

@ -45,6 +45,11 @@ python3.pkgs.buildPythonApplication rec {
pygobject3
];
preConfigure = ''
# app bundle for macos
substituteInPlace src/diffuse/meson.build data/icons/meson.build --replace "/Applications" "$out/Applications";
'';
mesonFlags = [
"-Db_ndebug=true"
];
@ -63,6 +68,6 @@ python3.pkgs.buildPythonApplication rec {
description = "Graphical tool for merging and comparing text files";
license = licenses.gpl2;
maintainers = with maintainers; [ k3a ];
platforms = platforms.linux;
platforms = platforms.unix;
};
}

4
pkgs/applications/misc/fetchmail/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "fetchmail";
version = "6.4.35";
version = "6.4.36";
src = fetchurl {
url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz";
sha256 = "sha256-ewtWy8D8qFRQTxZ3lfq1MtWlTVp9O24+NqM/NKCWCgE=";
sha256 = "sha256-cA1DODjT4p4wRFKuxWshh09TjsJBE/3LslE5xfLtwjo=";
};
buildInputs = [ openssl python3 ];

4
pkgs/applications/misc/gpxsee/default.nix
View File

@ -21,13 +21,13 @@ let
in
stdenv.mkDerivation rec {
pname = "gpxsee";
version = "11.11";
version = "11.12";
src = fetchFromGitHub {
owner = "tumic0";
repo = "GPXSee";
rev = version;
hash = "sha256-5kT1vcbCc0Fa3ylrcQetth50IQu57upiWRRpub93jlE=";
hash = "sha256-W35KBPYvTKrSi7UnzcUz8MsUwoq8rY5g/+hL1/gVpbI=";
};
patches = (substituteAll {

4
pkgs/applications/misc/kaufkauflist/default.nix
View File

@ -15,14 +15,14 @@ let
};
in buildNpmPackage rec {
pname = "kaufkauflist";
version = "1.0.0";
version = "2.0.0";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "annaaurora";
repo = "kaufkauflist";
rev = "v${version}";
hash = "sha256-feqk2FUs3lcnIgyPzhsow+xO9u7l9+9eZEk9jxRlpG4=";
hash = "sha256-oXrb6n1oD27bHt/zPWP0REQyCyZXI8BB57pdR/q42gY=";
};
npmDepsHash = "sha256-lSnGLK7+ac/wEpAxlpkZS/kgr9F+8WK+nRjCzkrPJt0=";

11
pkgs/applications/misc/octoprint/default.nix
View File

@ -28,6 +28,17 @@ let
sha256 = "sha256-eWOdJ7m3cY08ASN/X+7ILJK99iLJJwCY8294fwJiDew=";
};
});
flask-babel = super.flask-babel.overridePythonAttrs (oldAttrs: rec {
version = "2.0.0";
src = super.fetchPypi {
pname = "Flask-Babel";
inherit version;
sha256 = "sha256-+fr0XNsuGjLqLsFEA1h9QpUQjzUBenghorGsuM/ZJX0=";
};
nativeBuildInputs = [ ];
format = "setuptools";
outputs = [ "out" ];
});
}
)
# Built-in dependency

11
pkgs/applications/misc/stork/default.nix
View File

@ -9,16 +9,21 @@
rustPlatform.buildRustPackage rec {
pname = "stork";
version = "1.5.0";
version = "1.6.0";
src = fetchFromGitHub {
owner = "jameslittle230";
repo = "stork";
rev = "v${version}";
sha256 = "sha256-4aNY66y4dY+/MsZZGb5GBIlpZI+bAySff9+BEQUlx9M=";
sha256 = "sha256-qGcEhoytkCkcaA5eHc8GVgWvbOIyrO6BCp+EHva6wTw=";
};
cargoSha256 = "sha256-XyFZSQylBetf9tJLaV97oHbpe0aBadEZ60NyyxK8lfo=";
cargoSha256 = "sha256-a7ADTJ0VmKiZBr951JIAOSPWucsBl5JnM8eQHWssRM4=";
checkFlags = [
# Fails for 1.6.0, but binary works fine
"--skip=pretty_print_search_results::tests::display_pretty_search_results_given_output"
];
nativeBuildInputs = [ pkg-config ];

55
pkgs/applications/misc/tvbrowser/bin.nix
View File

@ -1,55 +0,0 @@
{ lib, stdenv, fetchurl, makeWrapper, jre, makeDesktopItem }:
let
desktopItem = makeDesktopItem {
name = "tvbrowser";
exec = "tvbrowser";
icon = "tvbrowser";
comment = "Themeable and easy to use TV Guide";
desktopName = "TV-Browser";
genericName = "Electronic TV Program Guide";
categories = [ "AudioVideo" "TV" "Java" ];
startupNotify = true;
startupWMClass = "tvbrowser-TVBrowser";
};
in stdenv.mkDerivation rec {
pname = "tvbrowser";
version = "4.0.1";
name = "${pname}-bin-${version}";
src = fetchurl {
url = "mirror://sourceforge/${pname}/TV-Browser%20Releases%20%28Java%208%20and%20higher%29/${version}/${pname}_${version}_bin.tar.gz";
sha256 = "0ahsirf6cazs5wykgbwsc6n35w6jprxyphzqmm7d370n37sb07pm";
};
nativeBuildInputs = [ makeWrapper ];
installPhase = ''
mkdir -p $out/share/java/${pname}
cp -R * $out/share/java/${pname}
rm $out/share/java/${pname}/${pname}.{sh,desktop}
mkdir -p $out/share/applications
ln -s ${desktopItem}/share/applications/* $out/share/applications/
for i in 16 32 48 128; do
mkdir -p $out/share/icons/hicolor/''${i}x''${i}/apps
ln -s $out/share/java/${pname}/imgs/${pname}$i.png $out/share/icons/hicolor/''${i}x''${i}/apps/${pname}.png
done
mkdir -p $out/bin
makeWrapper ${jre}/bin/java $out/bin/${pname} \
--add-flags "-jar $out/share/java/${pname}/${pname}.jar" \
--chdir "$out/share/java/${pname}"
'';
meta = with lib; {
description = "Electronic TV Program Guide";
homepage = "https://www.tvbrowser.org/";
sourceProvenance = with sourceTypes; [ binaryBytecode ];
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ jfrankenau ];
};
}

87
pkgs/applications/misc/tvbrowser/default.nix Normal file
View File

@ -0,0 +1,87 @@
{ lib
, fetchurl
, stdenv
, fetchzip
, ant
, jdk
, makeWrapper
, callPackage
}:
let
minimalJavaVersion = "11";
newsPlugin = fetchurl {
url = "https://www.tvbrowser.org/data/uploads/1372016422809_543/NewsPlugin.jar";
hash = "sha256-5XoypuMd2AFBE2SJ6EdECuvq6D81HLLuu9UoA9kcKAM=";
};
in
assert lib.versionAtLeast jdk.version minimalJavaVersion;
stdenv.mkDerivation rec {
pname = "tvbrowser";
version = "4.2.7";
src = fetchzip {
url = "mirror://sourceforge/${pname}/TV-Browser%20Releases%20%28Java%20${minimalJavaVersion}%20and%20higher%29/${version}/${pname}_${version}_src.tar.gz";
hash = "sha256-dmNfI6T0MU7UtMH+C/2hiAeDwZlFCB4JofQViZezoqI=";
};
nativeBuildInputs = [ ant jdk makeWrapper ];
buildPhase = ''
runHook preBuild
ant runtime-linux -Dnewsplugin.url=file://${newsPlugin}
ant tvbrowser-desktop-entry
runHook postBuild
'';
installPhase = ''
runHook preInstall
mkdir -p $out/share/${pname}
cp -R runtime/tvbrowser_linux/* $out/share/${pname}
mkdir -p $out/share/applications
mv -t $out/share/applications $out/share/${pname}/${pname}.desktop
sed -e 's|=imgs/|='$out'/share/${pname}/imgs/|' \
-e 's|=${pname}.sh|='$out'/bin/${pname}|' \
-i $out/share/applications/${pname}.desktop
for i in 16 32 48 128; do
mkdir -p $out/share/icons/hicolor/''${i}x''${i}/apps
ln -s $out/share/${pname}/imgs/${pname}$i.png $out/share/icons/hicolor/''${i}x''${i}/apps/${pname}.png
done
mkdir -p $out/bin
makeWrapper \
$out/share/${pname}/${pname}.sh \
$out/bin/${pname} \
--prefix PATH : ${jdk}/bin \
--prefix XDG_DATA_DIRS : $out/share \
--set PROGRAM_DIR $out/share/${pname}
runHook postInstall
'';
passthru.tests.startwindow = callPackage ./test.nix {};
meta = with lib; {
description = "Electronic TV Program Guide";
downloadPage = "https://www.tvbrowser.org/index.php?id=tv-browser";
homepage = "https://www.tvbrowser.org/";
changelog = "https://www.tvbrowser.org/index.php?id=news";
sourceProvenance = with sourceTypes; [ binaryBytecode fromSource ];
license = licenses.gpl3Plus;
mainProgram = pname;
platforms = platforms.linux;
maintainers = with maintainers; [ jfrankenau yarny ];
longDescription = ''
TV-Browser shows TV program data arranged like in printed
TV programs after downloading it from the internet.
Plugins are used to download program data
and to provide additional functionality.
'';
};
}

40
pkgs/applications/misc/tvbrowser/test.nix Normal file
View File

@ -0,0 +1,40 @@
{ lib
, xvfb-run
, tvbrowser
, runCommand
, writeShellApplication
, xorg
}:
let
testScript = writeShellApplication {
name = "tvbrowser-test-script";
runtimeInputs = [ xorg.xwininfo tvbrowser ];
text = ''
function find_tvbrowser_windows {
for window_name in java tvbrowser-TVBrowser 'Setup assistant' ; do
grep -q "$window_name" "$1" || return 1
done
}
tvbrowser &
for _ in {0..900} ; do
xwininfo -root -tree \
| sed 's/.*0x[0-9a-f]* \"\([^\"]*\)\".*/\1/; t; d' \
| tee window-names
echo
if find_tvbrowser_windows window-names ; then
break
fi
sleep 1
done
find_tvbrowser_windows window-names
'';
};
in
runCommand
"tvbrowser-test"
{ buildInputs = [ xvfb-run ]; }
''
HOME=$PWD xvfb-run ${lib.getExe testScript}
touch ${placeholder "out"}
''

6
pkgs/applications/networking/avalanchego/default.nix
View File

@ -8,16 +8,16 @@
buildGoModule rec {
pname = "avalanchego";
version = "1.9.7";
version = "1.9.8";
src = fetchFromGitHub {
owner = "ava-labs";
repo = pname;
rev = "v${version}";
hash = "sha256-7WiIw2k0ZNm6jFHIiJlKuWFdEhb11qGVot1B50Za/GY=";
hash = "sha256-5Zyrmo74k6Pl2pyVo3oX/haFsR8mHlM05ubPllintFQ=";
};
vendorHash = "sha256-2ezrasgGkMqr+dUF+TfsM5cevLGAFMyq9FlMxzKola8=";
vendorHash = "sha256-CpXszXmySPHQehFy6XSOJFXq8ZGixO928+zrP7/vwCQ=";
# go mod vendor has a bug, see: https://github.com/golang/go/issues/57529
proxyVendor = true;

786
pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
View File

File diff suppressed because it is too large Load Diff

6
pkgs/applications/networking/cluster/argocd/default.nix
View File

@ -2,17 +2,17 @@
buildGoModule rec {
pname = "argocd";
version = "2.5.9";
version = "2.5.10";
src = fetchFromGitHub {
owner = "argoproj";
repo = "argo-cd";
rev = "v${version}";
sha256 = "sha256-RZ3bcuJmUUnucD2lhfxLU8vbrorVUowF8hAW9NGSmbI=";
sha256 = "sha256-5UzDfOPuDM5ADsXFwWa9aDM32I5s/TKg4r7idH/X3AQ=";
};
proxyVendor = true; # darwin/linux hash mismatch
vendorHash = "sha256-F5EY1/WWRPBN5fqp2J2mdpIzL1gNKR0ltzSdarT6dFw=";
vendorHash = "sha256-rkgwfSmUmxmCxbS/0r5sU+XJTGZ6NTZ+VIXpBElT0uA=";
# Set target as ./cmd per cli-local
# https://github.com/argoproj/argo-cd/blob/master/Makefile#L227

2
pkgs/applications/networking/cluster/docker-machine/hyperkit.nix
View File

@ -1,7 +1,7 @@
{ lib, buildGoModule, minikube }:
buildGoModule rec {
inherit (minikube) version src nativeBuildInputs buildInputs vendorSha256 doCheck;
inherit (minikube) version src nativeBuildInputs buildInputs vendorHash doCheck;
pname = "docker-machine-hyperkit";

2
pkgs/applications/networking/cluster/docker-machine/kvm2.nix
View File

@ -1,7 +1,7 @@
{ lib, buildGoModule, minikube }:
buildGoModule rec {
inherit (minikube) version src nativeBuildInputs buildInputs vendorSha256 doCheck;
inherit (minikube) version src nativeBuildInputs buildInputs vendorHash doCheck;
pname = "docker-machine-kvm2";

6
pkgs/applications/networking/cluster/istioctl/default.nix
View File

@ -2,15 +2,15 @@
buildGoModule rec {
pname = "istioctl";
version = "1.16.1";
version = "1.16.2";
src = fetchFromGitHub {
owner = "istio";
repo = "istio";
rev = version;
sha256 = "sha256-IYmNmrUdlp0V+gsAwivkF73VcBBMDcA5QWSnJ+6qKks=";
sha256 = "sha256-Qvpg6qLrtnnMrRWFHv7J+drM75V6DaMu1jxcxaCJ4kk=";
};
vendorSha256 = "sha256-yCdCuwiAAdyeLtu4zE7d8RLbqM6FuH9sw0EqDZohQxg=";
vendorHash = "sha256-wPkjRkgQiGvZm+eOGVlM5cgrYugF/E8H71bcR2ofP2U=";
nativeBuildInputs = [ installShellFiles ];

6
pkgs/applications/networking/cluster/kyverno/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "kyverno";
version = "1.8.5";
version = "1.9.0";
src = fetchFromGitHub {
owner = "kyverno";
repo = "kyverno";
rev = "v${version}";
sha256 = "sha256-oEy1SNlYHDuZG2urbXEfROwzfNzdbu0Yjsq98Dw+Mws=";
sha256 = "sha256-i8uKhzvU9ftlzgzU4ViYg6z+OUNNHGbiFhFAwDKwtnw=";
};
ldflags = [
@ -18,7 +18,7 @@ buildGoModule rec {
"-X github.com/kyverno/kyverno/pkg/version.BuildTime=1970-01-01_00:00:00"
];
vendorSha256 = "sha256-nqJZdMkpJEG6VFCTwGUzXcCZPshJnY2FYHDm3xMlU0g=";
vendorHash = "sha256-BGIh1wzHIk1kSvk/sQ/tDBhGIOOx0o6Dk4LbK9Z1FAQ=";
subPackages = [ "cmd/cli/kubectl-kyverno" ];

38
pkgs/applications/networking/cluster/terraform-providers/providers.json
View File

@ -1,14 +1,12 @@
{
"aci": {
"deleteVendor": true,
"hash": "sha256-vTDuSZjO3ZHCUBaIYB7fvXvBPYywGJy307x2rCejOzk=",
"hash": "sha256-rgPqf8PopvzXiIOjng7DNOv920MPI81EVMUu3DaS8o4=",
"homepage": "https://registry.terraform.io/providers/CiscoDevNet/aci",
"owner": "CiscoDevNet",
"proxyVendor": true,
"repo": "terraform-provider-aci",
"rev": "v2.6.0",
"rev": "v2.6.1",
"spdx": "MPL-2.0",
"vendorHash": "sha256-dEnQa1GaYrx2jxsRSJWlMmy1hGsXACsp+5PtGmSDL6E="
"vendorHash": null
},
"acme": {
"hash": "sha256-fK34A45plTqtOYGbq8CAtFnyMYOvdOKFycY7X5ZlRRY=",
@ -130,11 +128,11 @@
"vendorHash": null
},
"azurerm": {
"hash": "sha256-eDlRnJUo561edblydjBGePJzMFRqtEqKnS+8HOhKGdA=",
"hash": "sha256-eZwQsvIXYwpx/uLJKmYnNaOFWBue1ADeyhVbvl3fAy0=",
"homepage": "https://registry.terraform.io/providers/hashicorp/azurerm",
"owner": "hashicorp",
"repo": "terraform-provider-azurerm",
"rev": "v3.41.0",
"rev": "v3.42.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
@ -148,14 +146,13 @@
"vendorHash": null
},
"baiducloud": {
"deleteVendor": true,
"hash": "sha256-CYU8PI/gMVC9lMiQaPd/M1SKjvZ6vaj5iBfLDTieZR4=",
"homepage": "https://registry.terraform.io/providers/baidubce/baiducloud",
"owner": "baidubce",
"repo": "terraform-provider-baiducloud",
"rev": "v1.19.4",
"spdx": "MPL-2.0",
"vendorHash": "sha256-3PLBs8LSE5JPtrhmdx+jQsnCrfZQQEUGA7wnf9M72yY="
"vendorHash": null
},
"bigip": {
"hash": "sha256-nlk3ckrLNtPQ9s8uQ2jvARinPVF+A2T0IUY2rBcUFDk=",
@ -424,11 +421,11 @@
"vendorHash": "sha256-uWTY8cFztXFrQQ7GW6/R+x9M6vHmsb934ldq+oeW5vk="
},
"github": {
"hash": "sha256-o/kJwByQDXgbazZPoYW4YeV7BK4Bb3pwQhnWMhW4klE=",
"hash": "sha256-QobAIpDDl5SXG9hmpdq8lDm8Sg5w2oK4A+e8WKw52Cc=",
"homepage": "https://registry.terraform.io/providers/integrations/github",
"owner": "integrations",
"repo": "terraform-provider-github",
"rev": "v5.16.0",
"rev": "v5.17.0",
"spdx": "MIT",
"vendorHash": null
},
@ -700,11 +697,10 @@
"hash": "sha256-2YqziG5HZbD/Io/vKYZFZK1PFYVYHOjzHah7s3xEtR0=",
"homepage": "https://registry.terraform.io/providers/terraform-lxd/lxd",
"owner": "terraform-lxd",
"proxyVendor": true,
"repo": "terraform-provider-lxd",
"rev": "v1.9.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-omaslX89hMAdIppBfILsGO6133Q3UgihgiJcy/Gn83M="
"vendorHash": "sha256-CLr28g/uI9ZU4xIcA76v/BX6gJV91elvFIlYFoSxkfw="
},
"mailgun": {
"hash": "sha256-r1E2Y5JRu77T29ebUNTXUEypnrsfYYbBhvpKZGt5T9w=",
@ -969,13 +965,13 @@
"vendorHash": null
},
"scaleway": {
"hash": "sha256-k02p6eoo152SWalGCX4iXhkE5xN55HpQ9A31j7wuIPE=",
"hash": "sha256-tLSTRoiqhi+CbdF8fmNLNMYN7FrDeoK/5XXyqCJnUKk=",
"homepage": "https://registry.terraform.io/providers/scaleway/scaleway",
"owner": "scaleway",
"repo": "terraform-provider-scaleway",
"rev": "v2.9.1",
"rev": "v2.10.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-FbWLXt7MFn/86NlSwCYpSV/6Ft3xRcESoNcVxM1A4ng="
"vendorHash": "sha256-cT9W2fP56TPOIoxWBWF0VXDuSKXZsJNs/GPpBq/0zZs="
},
"secret": {
"hash": "sha256-MmAnA/4SAPqLY/gYcJSTnEttQTsDd2kEdkQjQj6Bb+A=",
@ -1095,11 +1091,11 @@
"vendorHash": "sha256-2wPmLpjhG6QgG+BUCO0oIzHjBOWIOYuptgdtSIm9TZw="
},
"tencentcloud": {
"hash": "sha256-CLXW1takpsySUo8lpDe6DzRFczts1zRriHZge5uCb3A=",
"hash": "sha256-QJUxLwKG3XabACbAvLLKBG9+cmCYRQFpRTWRU6rKwfI=",
"homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud",
"owner": "tencentcloudstack",
"repo": "terraform-provider-tencentcloud",
"rev": "v1.79.6",
"rev": "v1.79.7",
"spdx": "MPL-2.0",
"vendorHash": null
},
@ -1168,13 +1164,13 @@
"vendorHash": null
},
"utils": {
"hash": "sha256-gJUnsuRRDrnFUSoqDugJQPAGl/V3GBDQq9i+pE87wVE=",
"hash": "sha256-nLi6aczJdADzdYNJaZldUOFFjgf3ujDdRrhSCuphIn8=",
"homepage": "https://registry.terraform.io/providers/cloudposse/utils",
"owner": "cloudposse",
"repo": "terraform-provider-utils",
"rev": "1.7.0",
"rev": "1.7.1",
"spdx": "Apache-2.0",
"vendorHash": "sha256-4V2StvyVj8fRZo5iRrpojMW36VDswOhLaBNDfrvH00s="
"vendorHash": "sha256-yTcroKTdYv0O8cX80A451I1vjYclVjA8P69fsb0wY/U="
},
"vault": {
"hash": "sha256-aNyCUDV1yjpmbPNYlxuJNaiXtG3fJySxRsDLJx/hZ04=",

4
pkgs/applications/networking/cluster/terragrunt/default.nix
View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "terragrunt";
version = "0.43.0";
version = "0.43.2";
src = fetchFromGitHub {
owner = "gruntwork-io";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-GOYSFhKfe8+9YBNyfCEUDCMssH9cXZi1S/KJTqPgBhY=";
hash = "sha256-PojwY5sLfO8n1obyb9aHp0ym5RDD6SLLth4977gTc+U=";
};
vendorHash = "sha256-niU6DGKNhSV+nm+8jIP//AItBu5eWTasyeL/ADvY2zA=";

4
pkgs/applications/networking/cluster/werf/default.nix
View File

@ -10,13 +10,13 @@
buildGoModule rec {
pname = "werf";
version = "1.2.198";
version = "1.2.199";
src = fetchFromGitHub {
owner = "werf";
repo = "werf";
rev = "v${version}";
hash = "sha256-fJDcVqHVN+2KXoqFCTACDevFtOllEGDMcQO/oDb6GMI=";
hash = "sha256-oUdqaoIvYTpJXWzfmgCwDJza5mTQItHgf2p9/HBMc/g=";
};
vendorHash = "sha256-GjcmpHyjhjCWE5gQR/oTHfhHYg5WRu8uhgAuWhdxlYk=";

4
pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
View File

@ -75,7 +75,7 @@ let
in
env.mkDerivation rec {
pname = "telegram-desktop";
version = "4.5.3";
version = "4.6.0";
# Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py
# Telegram-Desktop with submodules
@ -84,7 +84,7 @@ env.mkDerivation rec {
repo = "tdesktop";
rev = "v${version}";
fetchSubmodules = true;
sha256 = "060ajv9dd87qs202jr09i842vww1x25mg7vriyvmyw6rz0qf0d8l";
sha256 = "1kwg286mbpf0gj57702fqddmyn5iihzny3da425psnwa10s217yf";
};
postPatch = ''

13
pkgs/applications/networking/p2p/storrent/default.nix
View File

@ -1,22 +1,25 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "storrent-unstable";
version = "2021-10-10";
pname = "storrent";
version = "unstable-2023-01-14";
src = fetchFromGitHub {
owner = "jech";
repo = "storrent";
rev = "681733cf74de08bea251ada672ea8c666eb1b679";
sha256 = "0grrqgawswb44fahf40060jl691rlyccwlqkljvgy8mzzw1kjzj4";
rev = "86270ee777a19a521f8898a179485e0347f90ce0";
hash = "sha256-JYNtuyk4hhe1jZgY/5Bz91Ropdw/U7n1VKHYkdUjZ0I=";
};
vendorSha256 = "0sz2fz7bqgwd5i7sacyxs7bmb8ly6xrxrakqi9c446vzlkh898hj";
vendorHash = "sha256-iPKZPXsa6ya29N/u9QYd5LAm42+FtHZLGStRDxsAxe4=";
ldflags = [ "-s" "-w" ];
meta = with lib; {
homepage = "https://github.com/jech/storrent";
description = "An implementation of the BitTorrent protocol that is optimised for streaming media";
license = licenses.mit;
platforms = platforms.linux;
maintainers = [ maintainers.marsam ];
};
}

6
pkgs/applications/networking/sync/wdt/default.nix
View File

@ -14,13 +14,13 @@
stdenv.mkDerivation {
pname = "wdt";
version = "unstable-2022-07-08";
version = "unstable-2022-12-19";
src = fetchFromGitHub {
owner = "facebook";
repo = "wdt";
rev = "8f01b7558a80e5f08b06244d2821c3eb5c1d6e9b";
sha256 = "sha256-ozii7EA3j3F/o+lE2mPsUY5lrm3OOtK75gjGkrvoaQ0=";
rev = "6a122f24deb4f2ff6c6f97b6a803301a7f7b666c";
sha256 = "sha256-fH4Inqy7DfMJbW1FYWanScLATu8cZA1n+Vas8ee3xwA=";
};
nativeBuildInputs = [ cmake ];

4
pkgs/applications/office/libreoffice/default.nix
View File

@ -110,6 +110,7 @@
, wrapQtAppsHook ? null
, variant ? "fresh"
, symlinkJoin
, postgresql
} @ args:
assert builtins.elem variant [ "fresh" "still" ];
@ -404,6 +405,7 @@ in
"--with-system-libwps"
"--with-system-openldap"
"--with-system-coinmp"
"--with-system-postgresql"
# Without these, configure does not finish
"--without-junit"
@ -418,7 +420,6 @@ in
# I imagine this helps. Copied from go-oo.
# Modified on every upgrade, though
"--disable-odk"
"--disable-postgresql-sdbc"
"--disable-firebird-sdbc"
"--without-fonts"
"--without-doxygen"
@ -546,6 +547,7 @@ in
pam
perl
poppler
postgresql
python3
sane-backends
unixODBC

4
pkgs/applications/radio/sdrangel/default.nix
View File

@ -42,13 +42,13 @@
mkDerivation rec {
pname = "sdrangel";
version = "7.8.6";
version = "7.9.0";
src = fetchFromGitHub {
owner = "f4exb";
repo = "sdrangel";
rev = "v${version}";
sha256 = "sha256-tLU2OHFf1PPNRr1t3MWWCKnvILp1DW0k4TAxrXWI2X4=";
sha256 = "sha256-lX49R1GhYH45DhxOnn3r6b4VuG8GAissCscv1Qo2GB0=";
};
nativeBuildInputs = [ cmake pkg-config ];

10
pkgs/applications/science/electronics/appcsxcad/default.nix
View File

@ -5,7 +5,7 @@
, csxcad
, qcsxcad
, hdf5
, vtk_8_withQt5
, vtkWithQt5
, qtbase
, fparser
, tinyxml
@ -15,13 +15,13 @@
mkDerivation {
pname = "appcsxcad";
version = "unstable-2020-01-04";
version = "unstable-2023-01-06";
src = fetchFromGitHub {
owner = "thliebig";
repo = "AppCSXCAD";
rev = "de8c271ec8b57e80233cb2a432e3d7fd54d30876";
sha256 = "0shnfa0if3w588a68gr82qi6k7ldg1j2921fnzji90mmay21birp";
rev = "379ede4b8e00c11e8d0fb724c35547991b30c423";
hash = "sha256-L0ZEyovnfMzM7JuITBuhb4tJ2Aqgw52IiKEfEGq7Yo0=";
};
nativeBuildInputs = [
@ -32,7 +32,7 @@ mkDerivation {
csxcad
qcsxcad
hdf5
vtk_8_withQt5
vtkWithQt5
qtbase
fparser
tinyxml

10
pkgs/applications/science/electronics/csxcad/default.nix
View File

@ -5,7 +5,7 @@
, tinyxml
, hdf5
, cgal_5
, vtk_8
, vtk
, boost
, gmp
, mpfr
@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "csxcad";
version = "unstable-2020-02-08";
version = "unstable-2022-05-18";
src = fetchFromGitHub {
owner = "thliebig";
repo = "CSXCAD";
rev = "ef6e40931dbd80e0959f37c8e9614c437bf7e518";
sha256 = "072s765jyzpdq8qqysdy0dld17m6sr9zfcs0ip2zk8c4imxaysnb";
rev = "cd9decb4d9cebe3c8bf115e2c0ee73f730f22da1";
sha256 = "1604amhvp7dm8ych7gwzxwawqvb9hpjglk5ffd4qm0y3k6r89arn";
};
patches = [./searchPath.patch ];
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
boost
gmp
mpfr
vtk_8
vtk
fparser
tinyxml
hdf5

20
pkgs/applications/science/electronics/openboardview/default.nix
View File

@ -9,8 +9,12 @@
, fontconfig
, gtk3
, wrapGAppsHook
, darwin
}:
let
inherit (darwin.apple_sdk.frameworks) Cocoa;
in
stdenv.mkDerivation rec {
pname = "openboardview";
version = "9.0.3";
@ -24,11 +28,14 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ cmake pkg-config python3 wrapGAppsHook ];
buildInputs = [ SDL2 fontconfig gtk3 ];
buildInputs = [ SDL2 fontconfig gtk3 ] ++ lib.optionals stdenv.isDarwin [
Cocoa
];
postPatch = ''
substituteInPlace src/openboardview/CMakeLists.txt \
--replace "SDL2::SDL2main" ""
substituteInPlace CMakeLists.txt --replace "fixup_bundle" "#fixup_bundle"
'';
cmakeFlags = [
@ -37,9 +44,12 @@ stdenv.mkDerivation rec {
];
dontWrapGApps = true;
postFixup = ''
wrapGApp "$out/bin/${pname}" \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ gtk3 ]}
postFixup = lib.optionalString stdenv.isDarwin ''
mkdir -p "$out/Applications"
mv "$out/openboardview.app" "$out/Applications/OpenBoardView.app"
'' + lib.optionalString (!stdenv.isDarwin) ''
wrapGApp "$out/bin/${pname}" \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ gtk3 ]}
'';
passthru.updateScript = gitUpdater {
@ -50,7 +60,7 @@ stdenv.mkDerivation rec {
description = "Linux SDL/ImGui edition software for viewing .brd files";
homepage = "https://github.com/OpenBoardView/OpenBoardView";
license = licenses.mit;
platforms = platforms.linux;
platforms = platforms.unix;
maintainers = with maintainers; [ k3a ];
};
}

4
pkgs/applications/science/electronics/openems/default.nix
View File

@ -5,7 +5,7 @@
, fparser
, tinyxml
, hdf5
, vtk_8
, vtk
, boost
, zlib
, cmake
@ -39,7 +39,7 @@ stdenv.mkDerivation {
fparser
tinyxml
hdf5
vtk_8
vtk
boost
zlib
csxcad

4
pkgs/applications/science/misc/cwltool/default.nix
View File

@ -7,14 +7,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "cwltool";
version = "3.1.20230127121939";
version = "3.1.20230201130431";
format = "setuptools";
src = fetchFromGitHub {
owner = "common-workflow-language";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-pEow2vEpQ2+c3fXkB8q7R4pud1xLzE74+HEqcBzg0D8=";
hash = "sha256-rx5rdB8OgJ7Mck3pm1GRrymZbQ3lHlXFecICb/pbnKg=";
};
postPatch = ''

47
pkgs/applications/terminal-emulators/kitty/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, python3Packages, libunistring
{ lib, stdenv, fetchFromGitHub, python3Packages, libunistring
, harfbuzz, fontconfig, pkg-config, ncurses, imagemagick
, libstartup_notification, libGL, libX11, libXrandr, libXinerama, libXcursor
, libxkbcommon, libXi, libXext, wayland-protocols, wayland
@ -21,20 +21,23 @@
, zsh
, fish
, nixosTests
, go
, buildGoModule
}:
with python3Packages;
buildPythonApplication rec {
pname = "kitty";
version = "0.26.5";
version = "0.27.0";
format = "other";
src = fetchFromGitHub {
owner = "kovidgoyal";
repo = "kitty";
rev = "refs/tags/v${version}";
sha256 = "sha256-UloBlV26HnkvbzP/NynlPI77z09MBEVgtrg5SeTmwB4=";
hash = "sha256-742RB5ijCEYgjGgGyb6ZZ34GfMHm8253d3cNLQQzL38=";
};
vendorHash = "sha256-0hylttMwkmhpydKY7cpOoHrKmaGF4ediI8uwtcT3x4I=";
buildInputs = [
harfbuzz
@ -67,21 +70,15 @@ buildPythonApplication rec {
sphinx-copybutton
sphinxext-opengraph
sphinx-inline-tabs
go
] ++ lib.optionals stdenv.isDarwin [
imagemagick
libicns # For the png2icns tool.
];
outputs = [ "out" "terminfo" "shell_integration" ];
outputs = [ "out" "terminfo" "shell_integration" "kitten" ];
patches = [
# Fix clone-in-kitty not working on bash >= 5.2
# TODO: Removed on kitty release > 0.26.5
(fetchpatch {
url = "https://github.com/kovidgoyal/kitty/commit/51bba9110e9920afbefeb981e43d0c1728051b5e.patch";
sha256 = "sha256-1aSU4aU6j1/om0LsceGfhH1Hdzp+pPaNeWAi7U6VcP4=";
})
# Gets `test_ssh_env_vars` to pass when `bzip2` is in the output of `env`.
./fix-test_ssh_env_vars.patch
@ -99,7 +96,21 @@ buildPythonApplication rec {
# Causes build failure due to warning
hardeningDisable = lib.optional stdenv.cc.isClang "strictoverflow";
dontConfigure = true;
CGO_ENABLED = 0;
GO_FLAGS = "-trimpath";
disallowedReferences = [ go ];
configurePhase = let
goModules = (buildGoModule {
pname = "kitty-go-modules";
inherit src vendorHash version;
}).go-modules;
in ''
export GOCACHE=$TMPDIR/go-cache
export GOPATH="$TMPDIR/go"
export GOPROXY=off
cp -r --reflink=auto ${goModules} vendor
'';
buildPhase = let
commonOptions = ''
@ -114,17 +125,17 @@ buildPythonApplication rec {
runHook preBuild
${ lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) "export MACOSX_DEPLOYMENT_TARGET=11" }
${if stdenv.isDarwin then ''
${python.interpreter} setup.py build ${darwinOptions}
${python.pythonForBuild.interpreter} setup.py build ${darwinOptions}
make docs
${python.interpreter} setup.py kitty.app ${darwinOptions}
${python.pythonForBuild.interpreter} setup.py kitty.app ${darwinOptions}
'' else ''
${python.interpreter} setup.py build-launcher
${python.interpreter} setup.py linux-package \
${python.pythonForBuild.interpreter} setup.py linux-package \
--egl-library='${lib.getLib libGL}/lib/libEGL.so.1' \
--startup-notification-library='${libstartup_notification}/lib/libstartup-notification-1.so' \
--canberra-library='${libcanberra}/lib/libcanberra.so' \
--fontconfig-library='${fontconfig.lib}/lib/libfontconfig.so' \
${commonOptions}
${python.pythonForBuild.interpreter} setup.py build-launcher
''}
runHook postBuild
'';
@ -169,15 +180,19 @@ buildPythonApplication rec {
installPhase = ''
runHook preInstall
mkdir -p $out
mkdir -p $kitten/bin
${if stdenv.isDarwin then ''
mkdir "$out/bin"
ln -s ../Applications/kitty.app/Contents/MacOS/kitty "$out/bin/kitty"
ln -s ../Applications/kitty.app/Contents/MacOS/kitten "$out/bin/kitten"
cp ./kitty.app/Contents/MacOS/kitten "$kitten/bin/kitten"
mkdir "$out/Applications"
cp -r kitty.app "$out/Applications/kitty.app"
installManPage 'docs/_build/man/kitty.1'
'' else ''
cp -r linux-package/{bin,share,lib} $out
cp linux-package/bin/kitten $kitten/bin/kitten
''}
wrapProgram "$out/bin/kitty" --prefix PATH : "$out/bin:${lib.makeBinPath [ imagemagick ncurses.dev ]}"

57
pkgs/applications/version-management/scriv/default.nix Normal file
View File

@ -0,0 +1,57 @@
{ lib
, python3
, fetchPypi
, pandoc
, git
, scriv
, testers
}:
python3.pkgs.buildPythonApplication rec {
pname = "scriv";
version = "1.2.0";
src = fetchPypi {
inherit pname version;
hash = "sha256-u2HDD+pzFYpNGMKLu1eCHDCCRWg++w2Je9ReSnhWtHI=";
};
propagatedBuildInputs = with python3.pkgs; [
attrs
click
click-log
jinja2
requests
] ++ lib.optionals (python3.pythonOlder "3.11") [
tomli
];
nativeCheckInputs = with python3.pkgs; [
pytestCheckHook
coverage
freezegun
pudb
pytest-mock
responses
pyyaml
pandoc
git
];
disabledTests = [
# assumes we have checked out the full repo (including remotes)
"test_real_get_github_repos"
];
passthru.tests = {
version = testers.testVersion { package = scriv; };
};
meta = {
description = "Command-line tool for helping developers maintain useful changelogs.";
homepage = "https://github.com/nedbat/scriv";
changelog = "https://github.com/nedbat/scriv/releases/tag/${version}";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ amesgen ];
};
}

80
pkgs/applications/window-managers/miriway/default.nix Normal file
View File

@ -0,0 +1,80 @@
{ stdenv
, lib
, fetchFromGitHub
, unstableGitUpdater
, nixosTests
, cmake
, pkg-config
, mir
, libxkbcommon
}:
stdenv.mkDerivation rec {
pname = "miriway";
version = "unstable-2022-12-18";
src = fetchFromGitHub {
owner = "Miriway";
repo = "Miriway";
rev = "d294c303cb99b7becb0d6686be9a09f0a1f57596";
hash = "sha256-H+IZgI1IQxNl5yAygbDKXkyXajGHV/mp9gEqZcp0TeE=";
};
postPatch = ''
substituteInPlace CMakeLists.txt \
--replace "\''${CMAKE_INSTALL_PREFIX}/bin" "\''${CMAKE_INSTALL_BINDIR}" \
--replace "/usr/share" "\''${CMAKE_INSTALL_DATADIR}" \
--replace "/etc" "\''${CMAKE_INSTALL_SYSCONFDIR}"
sed -i -e '/project(/a include(GNUInstallDirs)' CMakeLists.txt
'';
strictDeps = true;
nativeBuildInputs = [
cmake
pkg-config
];
buildInputs = [
mir
libxkbcommon
];
passthru = {
updateScript = unstableGitUpdater { };
providedSessions = [ "miriway" ];
tests = {
inherit (nixosTests) miriway;
};
};
meta = with lib; {
description = "Mir based Wayland compositor";
longDescription = ''
Miriway is a starting point for creating a Wayland based desktop environment using Mir.
At the core of Miriway is miriway-shell, a Mir based Wayland compositor that provides:
- A "floating windows" window managament policy;
- Support for Wayland (and via Xwayland) X11 applications;
- Dynamic workspaces;
- Additional Wayland support for "shell components" such as panels and docs; and,
- Configurable shortcuts for launching standard apps such as launcher and terminal emulator.
In addition to miriway-shell, Miriway has:
- A "terminal emulator finder" script miriway-terminal, that works with most terminal emulators;
- A launch script miriway to simplify starting Miriway;
- A default configuration file miriway-shell.config; and,
- A greeter configuration miriway.desktop so Miriway can be selected at login
Miriway has been tested with shell components from several desktop environments and there are notes on
enabling these in miriway-shell.config.
'';
homepage = "https://github.com/Miriway/Miriway";
license = licenses.gpl3Only;
platforms = platforms.linux;
maintainers = with maintainers; [ OPNA2608 ];
};
}

4
pkgs/data/fonts/redhat-official/default.nix
View File

@ -2,13 +2,13 @@
stdenvNoCC.mkDerivation rec {
pname = "redhat-official";
version = "4.0.2";
version = "4.0.3";
src = fetchFromGitHub {
owner = "RedHatOfficial";
repo = "RedHatFont";
rev = version;
hash = "sha256-p5RS/57CDApwnRDwMi0gIEJYTDAtibIyyU2w/pnbHJI=";
hash = "sha256-r43KtMIedNitb5Arg8fTGB3hrRZoA8oUHVEL24k4LeQ=";
};
installPhase = ''

4
pkgs/data/fonts/samim-fonts/default.nix
View File

@ -2,13 +2,13 @@
stdenvNoCC.mkDerivation rec {
pname = "samim-fonts";
version = "4.0.4";
version = "4.0.5";
src = fetchFromGitHub {
owner = "rastikerdar";
repo = "samim-font";
rev = "v${version}";
hash = "sha256-erT8iV5YHbEN47nEE5p5CbQYUgm8daOjymLAWF4fpVk=";
hash = "sha256-DVBMsNOVAVwzlZ3cDus/3CSsC05bLZalQ2KeueEvwXs=";
};
installPhase = ''

4
pkgs/data/fonts/sarasa-gothic/default.nix
View File

@ -2,13 +2,13 @@
stdenvNoCC.mkDerivation rec {
pname = "sarasa-gothic";
version = "0.38.0";
version = "0.39.0";
src = fetchurl {
# Use the 'ttc' files here for a smaller closure size.
# (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.)
url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z";
hash = "sha256-UXWstk1vIoaFqa8nVxfJcAtN7BzWevzgfMx1gyXu0k8=";
hash = "sha256-n21aVsyQbZGR/dgAkYwMHB8VozTaazFVP29+p39SRKU=";
};
sourceRoot = ".";

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

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

6
pkgs/data/misc/v2ray-domain-list-community/default.nix
View File

@ -3,14 +3,14 @@
let
generator = pkgsBuildBuild.buildGoModule rec {
pname = "v2ray-domain-list-community";
version = "20230106031328";
version = "20230202101858";
src = fetchFromGitHub {
owner = "v2fly";
repo = "domain-list-community";
rev = version;
sha256 = "sha256-17yAIJQdxZAsNZ8W3HaW+EVKcPYy9fBOsSxU/0GEJuU=";
hash = "sha256-9K3Tjm1tVw5KJgT6UFcVmn/JzQidKCaQyC4EFX23QE0=";
};
vendorSha256 = "sha256-CCY3CgjA1w4svzmkaI2Jt272Rrt5UOt5sbVDAWRRfzk=";
vendorHash = "sha256-CCY3CgjA1w4svzmkaI2Jt272Rrt5UOt5sbVDAWRRfzk=";
meta = with lib; {
description = "community managed domain list";
homepage = "https://github.com/v2fly/domain-list-community";

4
pkgs/development/compilers/aspectj/default.nix
View File

@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
pname = "aspectj";
version = "1.9.9.1";
version = "1.9.19";
builder = ./builder.sh;
src = let
versionSnakeCase = builtins.replaceStrings ["."] ["_"] version;
in fetchurl {
url = "https://github.com/eclipse/org.aspectj/releases/download/V${versionSnakeCase}/aspectj-${version}.jar";
sha256 = "sha256-kiMQuEPXoSpHUiInkfYsrfCAcSc6mX42TRIBbeIQhWs=";
sha256 = "sha256-Oujyg05yvtcyfLmqonc++GX9AyFKwfIzITOHDz0px0M=";
};
inherit jre;

3
pkgs/development/compilers/llvm/10/lldb/default.nix
View File

@ -69,8 +69,11 @@ stdenv.mkDerivation (rec {
doCheck = false;
doInstallCheck = true;
installCheckPhase = ''
if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then
echo "ERROR: python files not installed where expected!";
return 1;
fi
'';

3
pkgs/development/compilers/llvm/11/lldb/default.nix
View File

@ -69,8 +69,11 @@ stdenv.mkDerivation (rec {
doCheck = false;
doInstallCheck = true;
installCheckPhase = ''
if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then
echo "ERROR: python files not installed where expected!";
return 1;
fi
'';

3
pkgs/development/compilers/llvm/12/lldb/default.nix
View File

@ -85,8 +85,11 @@ stdenv.mkDerivation (rec {
doCheck = false;
doInstallCheck = true;
installCheckPhase = ''
if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then
echo "ERROR: python files not installed where expected!";
return 1;
fi
'';

3
pkgs/development/compilers/llvm/13/lldb/default.nix
View File

@ -101,8 +101,11 @@ stdenv.mkDerivation (rec {
doCheck = false;
doInstallCheck = true;
installCheckPhase = ''
if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then
echo "ERROR: python files not installed where expected!";
return 1;
fi
'';

9
pkgs/development/compilers/llvm/14/lldb/default.nix
View File

@ -106,8 +106,15 @@ stdenv.mkDerivation (rec {
doCheck = false;
doInstallCheck = true;
installCheckPhase = ''
if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then
if [ ! -e $lib/${python3.sitePackages}/lldb/_lldb*.so ] ; then
echo "ERROR: python files not installed where expected!";
return 1;
fi
if [ ! -e "$lib/lib/lua/${lua5_3.luaversion}/lldb.so" ] ; then
echo "ERROR: lua files not installed where expected!";
return 1;
fi
'';

37
pkgs/development/compilers/llvm/14/lldb/gnu-install-dirs.patch
View File

@ -2,15 +2,33 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
index 79d451965ed4..78188978d6de 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,6 +12,8 @@ set(CMAKE_MODULE_PATH
@@ -10,6 +10,8 @@ set(CMAKE_MODULE_PATH
# If we are not building as part of LLVM, build LLDB as a standalone project,
# using LLVM as an external library.
if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
+ include(GNUInstallDirs)
+
project(lldb)
include(LLDBStandalone)
set(LLDB_BUILT_STANDALONE TRUE)
endif()
@@ -108,7 +110,7 @@ if (LLDB_ENABLE_PYTHON)
if(LLDB_BUILD_FRAMEWORK)
set(lldb_python_target_dir "${LLDB_FRAMEWORK_ABSOLUTE_BUILD_DIR}/LLDB.framework/Resources/Python/lldb")
else()
- set(lldb_python_target_dir "${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${LLDB_PYTHON_RELATIVE_PATH}/lldb")
+ set(lldb_python_target_dir "${CMAKE_INSTALL_LIBDIR}/../${LLDB_PYTHON_RELATIVE_PATH}/lldb")
endif()
get_target_property(lldb_python_bindings_dir swig_wrapper_python BINARY_DIR)
finish_swig_python("lldb-python" "${lldb_python_bindings_dir}" "${lldb_python_target_dir}")
@@ -118,7 +120,7 @@ if (LLDB_ENABLE_LUA)
if(LLDB_BUILD_FRAMEWORK)
set(lldb_lua_target_dir "${LLDB_FRAMEWORK_ABSOLUTE_BUILD_DIR}/LLDB.framework/Resources/Lua")
else()
- set(lldb_lua_target_dir "${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${LLDB_LUA_RELATIVE_PATH}")
+ set(lldb_lua_target_dir "${CMAKE_INSTALL_LIBDIR}/../${LLDB_LUA_RELATIVE_PATH}")
endif()
get_target_property(lldb_lua_bindings_dir swig_wrapper_lua BINARY_DIR)
finish_swig_lua("lldb-lua" "${lldb_lua_bindings_dir}" "${lldb_lua_target_dir}")
diff --git a/cmake/modules/AddLLDB.cmake b/cmake/modules/AddLLDB.cmake
index 3291a7c808e1..b27d27ce6a87 100644
--- a/cmake/modules/AddLLDB.cmake
@ -34,3 +52,16 @@ index 7d48491ec89a..c04543585588 100644
install(TARGETS lldbIntelFeatures
- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX})
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX})
diff --git a/cmake/modules/LLDBStandalone.cmake b/cmake/modules/LLDBStandalone.cmake
index 7d48491ec89a..c04543585588 100644
--- a/cmake/modules/LLDBStandalone.cmake
+++ b/cmake/modules/LLDBStandalone.cmake
@@ -70,7 +70,7 @@ endif()
# They are used as destination of target generators.
set(LLVM_RUNTIME_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin)
-set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX})
+set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX})
if(WIN32 OR CYGWIN)
# DLL platform -- put DLLs into bin.
set(LLVM_SHLIB_OUTPUT_INTDIR ${LLVM_RUNTIME_OUTPUT_INTDIR})

3
pkgs/development/compilers/llvm/8/lldb/default.nix
View File

@ -75,8 +75,11 @@ stdenv.mkDerivation rec {
doCheck = false;
doInstallCheck = true;
installCheckPhase = ''
if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then
echo "ERROR: python files not installed where expected!";
return 1;
fi
'';

3
pkgs/development/compilers/llvm/9/lldb/default.nix
View File

@ -80,8 +80,11 @@ stdenv.mkDerivation rec {
doCheck = false;
doInstallCheck = true;
installCheckPhase = ''
if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then
echo "ERROR: python files not installed where expected!";
return 1;
fi
'';

6
pkgs/development/compilers/uasm/default.nix
View File

@ -8,7 +8,7 @@
stdenv.mkDerivation rec {
pname = "uasm";
version = "2.55";
version = "2.56.2";
src = fetchFromGitHub {
owner = "Terraspace";
@ -17,10 +17,10 @@ stdenv.mkDerivation rec {
# the given path has multiple possibilities: #<Git::Ref:0x00007f618689c378>, #<Git::Ref:0x00007f618689c1e8>
# Probably because upstream has both a tag and a branch with the same name
rev = "refs/tags/v${version}";
sha256 = "sha256-CIbHPKJa60SyJeFgF1Tux7RfJZBChhUVXR7HGa+gCtQ=";
hash = "sha256-QiRBscY6zefeLDDVhS/+j9yIJ+5QhgkDQh1CLl/CslM=";
};
patches = lib.optionals stdenv.isDarwin [
patches = [
(fetchpatch {
name = "fix-v2_55-compilation-on-macos.patch";
url = "https://github.com/Terraspace/UASM/commit/b50c430cc3083c7f32e288a9f64fe1cafb03091d.patch";

17
pkgs/development/embedded/arduino/arduino-cli/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, buildGoModule, fetchFromGitHub, buildFHSUserEnv }:
{ lib, stdenv, buildGoModule, fetchFromGitHub, buildFHSUserEnv, installShellFiles }:
let
@ -13,6 +13,10 @@ let
sha256 = "sha256-jew4KLpOOXE9N/h4qFqof8y26DQrvm78E/ARbbwocD4=";
};
nativeBuildInputs = [
installShellFiles
];
subPackages = [ "." ];
vendorSha256 = "sha256-BunonnjzGnpcmGJXxEQXvjJLGvdSXUOK9zAhXoAemHY=";
@ -23,6 +27,15 @@ let
"-s" "-w" "-X github.com/arduino/arduino-cli/version.versionString=${version}" "-X github.com/arduino/arduino-cli/version.commit=unknown"
] ++ lib.optionals stdenv.isLinux [ "-extldflags '-static'" ];
postInstall = ''
export HOME="$(mktemp -d)"
for s in {bash,zsh,fish}; do
$out/bin/arduino-cli completion $s > completion.$s
installShellCompletion --cmd arduino-cli --$s completion.$s
done
unset HOME
'';
meta = with lib; {
inherit (src.meta) homepage;
description = "Arduino from the command line";
@ -46,7 +59,9 @@ if stdenv.isLinux then
extraInstallCommands = ''
mv $out/bin/$name $out/bin/arduino-cli
cp -r ${pkg.outPath}/share $out/share
'';
passthru.pureGoPkg = pkg;
targetPkgs = pkgs: with pkgs; [
zlib

2
pkgs/development/interpreters/python/cpython/default.nix
View File

@ -345,6 +345,8 @@ in with passthru; stdenv.mkDerivation {
"ac_cv_computed_gotos=yes"
"ac_cv_file__dev_ptmx=yes"
"ac_cv_file__dev_ptc=yes"
] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform && pythonAtLeast "3.11") [
"--with-build-python=${pythonForBuildInterpreter}"
] ++ optionals stdenv.hostPlatform.isLinux [
# Never even try to use lchmod on linux,
# don't rely on detecting glibc-isms.

4
pkgs/development/libraries/faudio/default.nix
View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "faudio";
version = "23.01";
version = "23.02";
src = fetchFromGitHub {
owner = "FNA-XNA";
repo = "FAudio";
rev = version;
sha256 = "sha256-/XfwQUkhn82vAKa7ZyiPbD4c7XJhCIncxvWkj/m2P0M=";
sha256 = "sha256-ycBwkFPzmOMG3umsznVtmE4MXunqCdjPpHgV73T/PMY=";
};
nativeBuildInputs = [cmake];

4
pkgs/development/libraries/kde-frameworks/kimageformats.nix
View File

@ -1,7 +1,7 @@
{
mkDerivation, lib,
extra-cmake-modules,
ilmbase, karchive, openexr, libavif, libheif, qtbase
ilmbase, karchive, openexr, libavif, libheif, libjxl, qtbase
}:
let inherit (lib) getDev; in
@ -10,7 +10,7 @@ mkDerivation {
pname = "kimageformats";
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ karchive openexr libavif libheif qtbase ];
buildInputs = [ karchive openexr libavif libheif libjxl qtbase ];
outputs = [ "out" ]; # plugins only
CXXFLAGS = "-I${getDev ilmbase}/include/OpenEXR";
cmakeFlags = [

4
pkgs/development/libraries/librevenge/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "librevenge";
version = "0.0.4";
version = "0.0.5";
src = fetchurl {
url = "mirror://sourceforge/project/libwpd/librevenge/librevenge-${version}/librevenge-${version}.tar.xz";
sha256 = "sha256-kz8HKfBCZ8w1S5oCvD6a/vpVEqO90LRfFZ7hSj4zR7I=";
sha256 = "sha256-EG0MRLtkCLE0i54EZWZvqDuBYXdmWiLNAX6IbBqu6zQ=";
};
nativeBuildInputs = [ pkg-config ];

4
pkgs/development/libraries/opencv/4.x.nix
View File

@ -48,7 +48,7 @@
, enableGtk3 ? false
, gtk3
, enableVtk ? false
, vtk_8
, vtk
, enableFfmpeg ? true
, ffmpeg
, enableGStreamer ? true
@ -253,7 +253,7 @@ stdenv.mkDerivation {
++ lib.optional (stdenv.buildPlatform == stdenv.hostPlatform) hdf5
++ lib.optional enableGtk2 gtk2
++ lib.optional enableGtk3 gtk3
++ lib.optional enableVtk vtk_8
++ lib.optional enableVtk vtk
++ lib.optional enableJPEG libjpeg
++ lib.optional enablePNG libpng
++ lib.optional enableTIFF libtiff

4
pkgs/development/libraries/opendht/default.nix
View File

@ -21,13 +21,13 @@
stdenv.mkDerivation rec {
pname = "opendht";
version = "2.4.10";
version = "2.4.12";
src = fetchFromGitHub {
owner = "savoirfairelinux";
repo = "opendht";
rev = "v${version}";
sha256 = "sha256-2jTphFpBsm72UDzlBlCP1fWk1qNuxicwVJtrEutOjM0=";
sha256 = "sha256-PC3Oaa1i2emkTB6ooBxvjuKVikzWjfmj89t1HP8tUXo=";
};
nativeBuildInputs = [

4
pkgs/development/libraries/pinocchio/default.nix
View File

@ -11,14 +11,14 @@
stdenv.mkDerivation rec {
pname = "pinocchio";
version = "2.6.15";
version = "2.6.16";
src = fetchFromGitHub {
owner = "stack-of-tasks";
repo = pname;
rev = "v${version}";
fetchSubmodules = true;
hash = "sha256-bnm5nbb0mKw76k2J2Qi04n7bmfzadtqV/AmnWSzbb+0=";
hash = "sha256-ihyLoElqpIhsZXPF3o4XgbkzeE/BYdz8+WhLLcpc6PE=";
};
# error: use of undeclared identifier '__sincos'

48
pkgs/development/libraries/rocfft/default.nix
View File

@ -19,7 +19,8 @@
}:
let
rocfft = stdenv.mkDerivation (finalAttrs: {
# This is over 3GB, to allow hydra caching we separate it
rf = stdenv.mkDerivation (finalAttrs: {
pname = "rocfft";
version = "5.4.2";
@ -112,27 +113,23 @@ let
};
});
rocfft-zero = runCommand "rocfft-zero" { preferLocalBuild = true; } ''
mkdir -p $out
cp -a ${rocfft}/lib/librocfft-device-0* $out
rf-zero = runCommand "librocfft-device-0.so.0.1" { preferLocalBuild = true; } ''
cp -a ${rf}/lib/$name $out
'';
rocfft-one = runCommand "rocfft-one" { preferLocalBuild = true; } ''
mkdir -p $out
cp -a ${rocfft}/lib/librocfft-device-1* $out
rf-one = runCommand "librocfft-device-1.so.0.1" { preferLocalBuild = true; } ''
cp -a ${rf}/lib/$name $out
'';
rocfft-two = runCommand "rocfft-two" { preferLocalBuild = true; } ''
mkdir -p $out
cp -a ${rocfft}/lib/librocfft-device-2* $out
rf-two = runCommand "librocfft-device-2.so.0.1" { preferLocalBuild = true; } ''
cp -a ${rf}/lib/$name $out
'';
rocfft-three = runCommand "rocfft-three" { preferLocalBuild = true; } ''
mkdir -p $out
cp -a ${rocfft}/lib/librocfft-device-3* $out
rf-three = runCommand "librocfft-device-3.so.0.1" { preferLocalBuild = true; } ''
cp -a ${rf}/lib/$name $out
'';
in stdenv.mkDerivation {
inherit (rocfft) pname version outputs src passthru meta;
inherit (rf) pname version outputs src passthru meta;
dontUnpack = true;
dontPatch = true;
@ -143,16 +140,15 @@ in stdenv.mkDerivation {
runHook preInstall
mkdir -p $out/lib
for path in ${rocfft-zero} ${rocfft-one} ${rocfft-two} ${rocfft-three}; do
cp -as $path/* $out/lib
done
cp -an ${rocfft}/* $out
cp -as ${rf-zero} $out/lib/${rf-zero.name}
cp -as ${rf-one} $out/lib/${rf-one.name}
cp -as ${rf-two} $out/lib/${rf-two.name}
cp -as ${rf-three} $out/lib/${rf-three.name}
cp -an ${rf}/* $out
'' + lib.optionalString buildTests ''
cp -a ${rocfft.test} $test
cp -a ${rf.test} $test
'' + lib.optionalString buildBenchmarks ''
cp -a ${rocfft.benchmark} $benchmark
cp -a ${rf.benchmark} $benchmark
'' + ''
runHook postInstall
'';
@ -160,18 +156,18 @@ in stdenv.mkDerivation {
# Fix paths
preFixup = ''
substituteInPlace $out/include/*.h $out/rocfft/include/*.h \
--replace "${rocfft}" "$out"
--replace "${rf}" "$out"
patchelf --set-rpath \
$(patchelf --print-rpath $out/lib/librocfft.so | sed 's,${rocfft}/lib,'"$out/lib"',') \
$(patchelf --print-rpath $out/lib/librocfft.so | sed 's,${rf}/lib,'"$out/lib"',') \
$out/lib/librocfft.so
'' + lib.optionalString buildTests ''
patchelf --set-rpath \
$(patchelf --print-rpath $test/bin/rocfft-test | sed 's,${rocfft}/lib,'"$out/lib"',') \
$(patchelf --print-rpath $test/bin/rocfft-test | sed 's,${rf}/lib,'"$out/lib"',') \
$test/bin/rocfft-test
'' + lib.optionalString buildBenchmarks ''
patchelf --set-rpath \
$(patchelf --print-rpath $benchmark/bin/rocfft-rider | sed 's,${rocfft}/lib,'"$out/lib"',') \
$(patchelf --print-rpath $benchmark/bin/rocfft-rider | sed 's,${rf}/lib,'"$out/lib"',') \
$benchmark/bin/rocfft-rider
'';
}

10
pkgs/development/libraries/science/electronics/qcsxcad/default.nix
View File

@ -4,19 +4,19 @@
, cmake
, csxcad
, tinyxml
, vtk_8_withQt5
, vtkWithQt5
, qtbase
}:
mkDerivation {
pname = "qcsxcad";
version = "unstable-2020-01-04";
version = "unstable-2023-01-06";
src = fetchFromGitHub {
owner = "thliebig";
repo = "QCSXCAD";
rev = "0dabbaf2bc1190adec300871cf309791af842c8e";
sha256 = "11kbh0mxbdfh7s5azqin3i2alic5ihmdfj0jwgnrhlpjk4cbf9rn";
rev = "1cde9d560a5000f4c24c249d2dd5ccda12de38b6";
hash = "sha256-kc9Vnx6jGiQC2K88ZH00b61D/DbWxAIZZwYCsINqtrY=";
};
outputs = [ "out" "dev" ];
@ -33,7 +33,7 @@ mkDerivation {
buildInputs = [
csxcad
tinyxml
vtk_8_withQt5
vtkWithQt5
qtbase
];

47
pkgs/development/libraries/xeus/default.nix Normal file
View File

@ -0,0 +1,47 @@
{ lib
, stdenv
, fetchFromGitHub
, cmake
, doctest
, nlohmann_json
, libuuid
, xtl
}:
stdenv.mkDerivation rec {
pname = "xeus";
version = "3.0.5";
src = fetchFromGitHub {
owner = "jupyter-xeus";
repo = pname;
rev = version;
sha256 = "sha256-LeU4PJ1UKfGqkRKq0/Mn9gjwNmXCy0/2SbjWJrjlOyU=";
};
nativeBuildInputs = [
cmake
doctest
];
buildInputs = [
nlohmann_json
libuuid
xtl
];
cmakeFlags = [
"-DXEUS_BUILD_TESTS=ON"
];
doCheck = true;
preCheck = ''export LD_LIBRARY_PATH=$PWD'';
meta = with lib; {
homepage = "https://xeus.readthedocs.io";
description = "C++ implementation of the Jupyter Kernel protocol";
license = licenses.bsd3;
maintainers = with maintainers; [ serge_sans_paille ];
platforms = platforms.all;
};
}

4
pkgs/development/misc/brev-cli/default.nix
View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "brev-cli";
version = "0.6.202";
version = "0.6.204";
src = fetchFromGitHub {
owner = "brevdev";
repo = pname;
rev = "v${version}";
sha256 = "sha256-H16CNJ8ztcwGDoH4dZ66/HbpNVEe+pYpKJcFpjW2wCs=";
sha256 = "sha256-MQF0mU1cpvkJ6VZE6A8J4W6DMS8RXhjLisrPkKParl4=";
};
vendorHash = "sha256-IR/tgqh8rS4uN5jSOcopCutbHCKHSU9icUfRhOgu4t8=";

4
pkgs/development/python-modules/aiosomecomfort/default.nix
View File

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "aiosomecomfort";
version = "0.0.6";
version = "0.0.7";
format = "setuptools";
@ -15,7 +15,7 @@ buildPythonPackage rec {
owner = "mkmer";
repo = "AIOSomecomfort";
rev = "refs/tags/${version}";
hash = "sha256-3p38gWCqQVYz3sgu6SgfPH+wH/ZH2Qg+tVXiARuUh7s=";
hash = "sha256-NVtoQJOC4rNny95/lFk2eJ5mycNSuZrIy1GGZKYZ1VA=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/aioswitcher/default.nix
View File

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "aioswitcher";
version = "3.2.1";
version = "3.2.2";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "TomerFi";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-k3xmW8aMBz6dbWuLnd6tw2BFoTuD80fpY7q2NfYqMlw=";
hash = "sha256-17LTNQjI2UfgtlNNkSRSWMNnhgokBXn/7KGuKo5Ai4E=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/ansible-compat/default.nix
View File

@ -12,12 +12,12 @@
buildPythonPackage rec {
pname = "ansible-compat";
version = "2.2.7";
version = "3.0.1";
format = "pyproject";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-CN7dzQodxrqr5nSwfG/4ghGEksEj0oH1bwGQUnGn/8Q=";
sha256 = "sha256-19xeS3+t6bc3XFaKJEdbe+gQJMrCogyu8yYO8LUSh7Q=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/ansible/default.nix
View File

@ -20,7 +20,7 @@
let
pname = "ansible";
version = "7.1.0";
version = "7.2.0";
in
buildPythonPackage {
inherit pname version;
@ -30,7 +30,7 @@ buildPythonPackage {
src = fetchPypi {
inherit pname version;
sha256 = "sha256-HkcjjEqp5owMU2ej/XB7psOUm0qvkSsGRArXjdK/AY0=";
sha256 = "sha256-YOLBpY8c6zShkLfDgPezOG0ec2kGGVSx+LjKPfdgY8w=";
};
postPatch = ''

70
pkgs/development/python-modules/arsenic/default.nix Normal file
View File

@ -0,0 +1,70 @@
{ lib
, aiohttp
, attrs
, buildPythonPackage
, fetchFromGitHub
, fetchpatch
, poetry-core
, pytestCheckHook
, pythonRelaxDepsHook
, pythonOlder
, structlog
}:
buildPythonPackage rec {
pname = "arsenic";
version = "21.8";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "HENNGE";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-fsLo22PR9WdX2FazPgr8B8dFq6EM1LLTpRFGEm/ymCE=";
};
patches = [
# Switch to poetry-core, https://github.com/HENNGE/arsenic/pull/160
(fetchpatch {
name = "switch-to-poetry-core.patch";
url = "https://github.com/HENNGE/arsenic/commit/ca82894a5f1e832ab9283a245258b334bdd48855.patch";
hash = "sha256-ECCUaJF4MRmFOKH1C6HowJ+zmbEPPiS7h9DlKw5otZc=";
})
];
pythonRelaxDeps = [
"structlog"
];
nativeBuildInputs = [
poetry-core
pythonRelaxDepsHook
];
propagatedBuildInputs = [
aiohttp
attrs
structlog
];
nativeCheckInputs = [
pytestCheckHook
];
# Depends on asyncio_extras which is not longer maintained
doCheck = false;
pythonImportsCheck = [
"arsenic"
];
meta = with lib; {
description = "WebDriver implementation for asyncio and asyncio-compatible frameworks";
homepage = "https://github.com/HENNGE/arsenic/";
changelog = "https://github.com/HENNGE/arsenic/releases/tag/${version}";
license = licenses.asl20;
maintainers = with maintainers; [ fab ];
};
}

4
pkgs/development/python-modules/dataset/default.nix
View File

@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "dataset";
version = "1.5.2";
version = "1.6.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-TDZ6fAqFxOdI79o07uMAw/zD8HbHXDKQt0mnoFM1yEc=";
hash = "sha256-fNvJBdZjtYKvhGzwULfP2iDNUrqhxiwRlhlFrHfmGdU=";
};
propagatedBuildInputs = [

5
pkgs/development/python-modules/elementpath/default.nix
View File

@ -6,7 +6,7 @@
buildPythonPackage rec {
pname = "elementpath";
version = "3.0.2";
version = "4.0.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -15,7 +15,7 @@ buildPythonPackage rec {
owner = "sissaschool";
repo = "elementpath";
rev = "refs/tags/v${version}";
hash = "sha256-b+Th28GI2UOmfO4jy4biohAJWPiYWkvFLqqs9lgR4Vc=";
hash = "sha256-BEnSPRuQUnKXtPAJfjxS+fwE0rpPj1U2yRK8eImKMYw=";
};
# avoid circular dependency with xmlschema which directly depends on this
@ -28,6 +28,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "XPath 1.0/2.0 parsers and selectors for ElementTree and lxml";
homepage = "https://github.com/sissaschool/elementpath";
changelog = "https://github.com/sissaschool/elementpath/blob/${version}/CHANGELOG.rst";
license = licenses.mit;
maintainers = with maintainers; [ jonringer ];
};

4
pkgs/development/python-modules/fastapi-mail/default.nix
View File

@ -19,7 +19,7 @@
buildPythonPackage rec {
pname = "fastapi-mail";
version = "1.2.4";
version = "1.2.5";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -28,7 +28,7 @@ buildPythonPackage rec {
owner = "sabuhish";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-6Iwgl15adc6wK7i8sFLeSf2HSvMo/Sx/BI44qboNnRM=";
hash = "sha256-SogtdLTiTCJ8qUYsnwhPgBLFbj66EJC7L4wS64Nmuoo=";
};
postPatch = ''

4
pkgs/development/python-modules/ghrepo-stats/default.nix
View File

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "ghrepo-stats";
version = "0.5.1";
version = "0.5.2";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "mrbean-bremen";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-QHFwIfX0rSVnWgxe82zQXMwIS99CiPgprfoMbuXvXH0=";
hash = "sha256-YKGVDE1cM3Lcr9lHE2iserleob0BE3DxchdSX65CJBE=";
};
postPatch = ''

4
pkgs/development/python-modules/hahomematic/default.nix
View File

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "hahomematic";
version = "2023.2.1";
version = "2023.2.1.1";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "danielperna84";
repo = pname;
rev = "refs/tags/${version}";
sha256 = "sha256-kTWUwHgcq+J3ok43gpXmsxmKTnrjPMzmowSkm404j4Q=";
sha256 = "sha256-JYoTX83N70ARI9CvoUujRPI6hUVkIC1Ma/D/hjtLTes=";
};
nativeBuildInputs = [

11
pkgs/development/python-modules/jaraco-abode/default.nix
View File

@ -3,7 +3,6 @@
, pythonOlder
, fetchFromGitHub
, fetchPypi
, fetchpatch
, setuptools
, setuptools-scm
, requests
@ -39,14 +38,10 @@ buildPythonPackage rec {
hash = "sha256-ZDdZba1oTOPaUm+r4fWC5E3ni/k8kXo6t5AWQTvfd5E=";
};
patches = [
postPatch = ''
# https://github.com/jaraco/jaraco.abode/issues/19
(fetchpatch {
name = "specify-options-package-data.patch";
url = "https://github.com/jaraco/jaraco.abode/commit/8deebf57162fa097243d2b280942b6b7f95174c8.patch";
hash = "sha256-Iu2uw9D+nMdVJZyoecEkwQaJH1oSzFN/ZLXKPZPGuPk=";
})
];
echo "graft jaraco" > MANIFEST.in
'';
nativeBuildInputs = [
setuptools

4
pkgs/development/python-modules/oralb-ble/default.nix
View File

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "oralb-ble";
version = "0.17.1";
version = "0.17.2";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "Bluetooth-Devices";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-0VZRtsh17W8h1qcGfAxE4KUehtCk1PKy3MO3fVJb4qY=";
hash = "sha256-v2c1FoLgG6HH02d+YBr4Qh12ztRsiwWyueUNOBpWqPM=";
};
nativeBuildInputs = [

54
pkgs/development/python-modules/peewee-migrate/default.nix Normal file
View File

@ -0,0 +1,54 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
# runtime
, cached-property
, click
, peewee
# tests
, psycopg2
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "peewee-migrate";
version = "1.6.6";
format = "setuptools";
src = fetchFromGitHub {
owner = "klen";
repo = "peewee_migrate";
rev = "refs/tags/${version}";
hash = "sha256-gUtxsvPj8pwzijia313d553j9U2LP5vKJHxVU1SqsV8=";
};
postPatch = ''
sed -i '/addopts/d' setup.cfg
'';
propagatedBuildInputs = [
peewee
click
] ++ lib.optionals (pythonOlder "3.8") [
cached-property
];
pythonImportsCheck = [
"peewee_migrate"
];
nativeCheckInputs = [
psycopg2
pytestCheckHook
];
meta = with lib; {
description = "Simple migration engine for Peewee";
homepage = "https://github.com/klen/peewee_migrate";
license = licenses.bsd3;
maintainers = with maintainers; [ hexa ];
};
}

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