Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
ae91e9a960
|
|
@ -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";
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
60
nixos/modules/programs/miriway.nix
Normal file
60
nixos/modules/programs/miriway.nix
Normal 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 ];
|
||||
}
|
||||
|
|
@ -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 {};
|
||||
|
|
|
|||
126
nixos/tests/miriway.nix
Normal file
126
nixos/tests/miriway.nix
Normal 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")
|
||||
'';
|
||||
})
|
||||
51
pkgs/applications/blockchains/ton/default.nix
Normal file
51
pkgs/applications/blockchains/ton/default.nix
Normal 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 ];
|
||||
};
|
||||
}
|
||||
|
|
@ -293,12 +293,12 @@ final: prev:
|
|||
|
||||
SchemaStore-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "SchemaStore.nvim";
|
||||
version = "2023-01-30";
|
||||
version = "2023-02-03";
|
||||
src = fetchFromGitHub {
|
||||
owner = "b0o";
|
||||
repo = "SchemaStore.nvim";
|
||||
rev = "d98828169af99624031d8535785a099cdf60d4c3";
|
||||
sha256 = "0j3lkz7lbd0naqqp6y2nlk9zawd453m41diia7f0saiyix76r6cp";
|
||||
rev = "bb952ae19d2b227b549133a3b0ed69a3436d208e";
|
||||
sha256 = "0lg5ibn3q1kw951k7j11f7c24qmf4sy9y3y2pqlpvk9bvc095jyl";
|
||||
};
|
||||
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/";
|
||||
};
|
||||
|
|
@ -859,12 +859,12 @@ final: prev:
|
|||
|
||||
barbecue-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "barbecue.nvim";
|
||||
version = "2023-02-01";
|
||||
version = "2023-02-03";
|
||||
src = fetchFromGitHub {
|
||||
owner = "utilyre";
|
||||
repo = "barbecue.nvim";
|
||||
rev = "e3db3c4e25f5531bcb74b7951f52e425731433e5";
|
||||
sha256 = "0b69g3vr78x4hy5sj354iws43x4mm8qlqwfzl6cbiga16pa659ay";
|
||||
rev = "ed0a85f5212124cafb611af8365c162b64e4064d";
|
||||
sha256 = "05ya1zpg86w6q9r1s3i8bm42hw5h612aa2jghl34j7z7pdwcy3ns";
|
||||
};
|
||||
meta.homepage = "https://github.com/utilyre/barbecue.nvim/";
|
||||
};
|
||||
|
|
@ -2155,12 +2155,12 @@ final: prev:
|
|||
|
||||
coq_nvim = buildVimPluginFrom2Nix {
|
||||
pname = "coq_nvim";
|
||||
version = "2023-01-29";
|
||||
version = "2023-02-03";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ms-jpq";
|
||||
repo = "coq_nvim";
|
||||
rev = "b6032a67b53ca92b7bda401ef45284e888c5f4b6";
|
||||
sha256 = "1wxwwnbbz25idi4bwqzb9byf44awss97ca1925n5gmxq19g7x1gc";
|
||||
rev = "67b7623184406dda85ae0ea678cb82a6f2a509d0";
|
||||
sha256 = "0gzna1qyialp6b4iap9jnfhf3w7anp7xlg6hdal2r0i60h9f0igm";
|
||||
};
|
||||
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-03";
|
||||
src = fetchFromGitHub {
|
||||
owner = "glepnir";
|
||||
repo = "dashboard-nvim";
|
||||
rev = "f4eedba90f0a55111351fd45444db5a82081727f";
|
||||
sha256 = "00h2n33m6mhvkxqdrwnfijwj2j5v0j6daa9422mmxf6m3qxgs03k";
|
||||
rev = "5d7b14dfa88a32040647649b1e714051235bfd32";
|
||||
sha256 = "1iknwbwiq2rykf36vr3agdzlyb54mkppjywh4qdgqgach71016l3";
|
||||
};
|
||||
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/";
|
||||
};
|
||||
|
|
@ -5243,12 +5243,12 @@ final: prev:
|
|||
|
||||
neoformat = buildVimPluginFrom2Nix {
|
||||
pname = "neoformat";
|
||||
version = "2023-01-11";
|
||||
version = "2023-02-03";
|
||||
src = fetchFromGitHub {
|
||||
owner = "sbdchd";
|
||||
repo = "neoformat";
|
||||
rev = "ec601d38a2e9309109f405ce038c5a6ce774f1a9";
|
||||
sha256 = "028xycbvjhs7mvnzlismjipibgqdhjm9s0asmjpg3g7y2qhkw3ix";
|
||||
rev = "2b956364bfd64cceecb12cf43dfe81d6b831fb35";
|
||||
sha256 = "1ycr3s1g00imih7g8gqvyzj9rg0dh1qwdvn78cwfn0hqm24ab8dc";
|
||||
};
|
||||
meta.homepage = "https://github.com/sbdchd/neoformat/";
|
||||
};
|
||||
|
|
@ -5319,8 +5319,8 @@ final: prev:
|
|||
src = fetchFromGitHub {
|
||||
owner = "nvim-neorg";
|
||||
repo = "neorg";
|
||||
rev = "6cc56c6b50fcac81471805d50db7cf5770cb5e8a";
|
||||
sha256 = "1zwcbfl23rnk7hq5d2m0blxwanlws3hikk7k89cbsc76kwqims2y";
|
||||
rev = "7cc4c95d685c96071f48d352b7378dfe8fcd24a1";
|
||||
sha256 = "0rhn1j9sx0wcp13fzlrsy39mvqb4djy29l18pyyig293gqbgjfd7";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-neorg/neorg/";
|
||||
};
|
||||
|
|
@ -5555,12 +5555,12 @@ final: prev:
|
|||
|
||||
nlsp-settings-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "nlsp-settings.nvim";
|
||||
version = "2023-02-02";
|
||||
version = "2023-02-03";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tamago324";
|
||||
repo = "nlsp-settings.nvim";
|
||||
rev = "5541d073b93a404445907e0aec3ebd9cf8914e53";
|
||||
sha256 = "0r4bbppp95rdhpz9j24w6smpzv891gk1ja6dis7j4gf3sra57hqy";
|
||||
rev = "dcd316d381c5768cd6a11d53a3331e92c3943f3b";
|
||||
sha256 = "06cd6hyckmp2jvrh8k2sp465yarkznk6adwh0lmd95i6wrb1zhky";
|
||||
};
|
||||
meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/";
|
||||
};
|
||||
|
|
@ -6411,8 +6411,8 @@ final: prev:
|
|||
src = fetchFromGitHub {
|
||||
owner = "nvim-treesitter";
|
||||
repo = "nvim-treesitter";
|
||||
rev = "588cdb6c0652356dacc7d29bb4bb2b273df2df86";
|
||||
sha256 = "087gdja192ziqzy3npz598l5yk0fly2n0g5748axsbbzb8l1a429";
|
||||
rev = "0e6d4b4172f30c4aa44a9adc9ea5719723a1fac3";
|
||||
sha256 = "1n98salqvdh23yxkx1m490sf6hvjqjzpyxm459sk33znj2j7nzvv";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
|
||||
};
|
||||
|
|
@ -6503,11 +6503,11 @@ final: prev:
|
|||
|
||||
nvim-ts-rainbow2 = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-ts-rainbow2";
|
||||
version = "2023-01-19";
|
||||
version = "2023-02-03";
|
||||
src = fetchgit {
|
||||
url = "https://gitlab.com/HiPhish/nvim-ts-rainbow2";
|
||||
rev = "2e0e2167f173df2f075fd52add2a0d6c66a2344a";
|
||||
sha256 = "0z5w6y6ynv4q8rjcrfi2vklf9l9h5azda73ragqbfijkx9ggniyy";
|
||||
rev = "b915c4d4926f723c0a424e1a639384018e7d9efc";
|
||||
sha256 = "0sllv769q0v73alcxs1r8dpij8kp9f771sq93z9c413c35wwmcnz";
|
||||
};
|
||||
meta.homepage = "https://gitlab.com/HiPhish/nvim-ts-rainbow2";
|
||||
};
|
||||
|
|
@ -6610,12 +6610,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/";
|
||||
|
|
@ -7887,12 +7887,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 +8226,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/";
|
||||
};
|
||||
|
|
@ -14017,12 +14017,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/";
|
||||
};
|
||||
|
|
@ -14045,8 +14045,8 @@ final: prev:
|
|||
src = fetchFromGitHub {
|
||||
owner = "glepnir";
|
||||
repo = "lspsaga.nvim";
|
||||
rev = "a2e3f7cf76f4cb102d3fc165bd8c9a565053e84f";
|
||||
sha256 = "1d0ha7pjjzbhvkcn0z1dgnz2r3jkviad0hipvcw1xy5jnnym4sm5";
|
||||
rev = "2afe6de953b76d43822cf8377c019ff831a7c73b";
|
||||
sha256 = "1japfd2f7yw2vbyk7mh1qr0x6dnnra1k7frl3k077spc3nanh57r";
|
||||
};
|
||||
meta.homepage = "https://github.com/glepnir/lspsaga.nvim/";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -580,6 +580,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 +835,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";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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=";
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -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=",
|
||||
|
|
|
|||
|
|
@ -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=";
|
||||
|
|
|
|||
|
|
@ -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 = ''
|
||||
|
|
|
|||
|
|
@ -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 ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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 ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
57
pkgs/applications/version-management/scriv/default.nix
Normal file
57
pkgs/applications/version-management/scriv/default.nix
Normal 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
80
pkgs/applications/window-managers/miriway/default.nix
Normal 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 ];
|
||||
};
|
||||
}
|
||||
|
|
@ -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,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];
|
||||
|
|
|
|||
|
|
@ -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
|
||||
'';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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 = [
|
||||
|
|
|
|||
|
|
@ -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 = ''
|
||||
|
|
|
|||
|
|
@ -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 = [
|
||||
|
|
|
|||
54
pkgs/development/python-modules/peewee-migrate/default.nix
Normal file
54
pkgs/development/python-modules/peewee-migrate/default.nix
Normal 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 ];
|
||||
};
|
||||
}
|
||||
|
|
@ -24,7 +24,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pikepdf";
|
||||
version = "6.2.8";
|
||||
version = "6.2.9";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -39,7 +39,7 @@ buildPythonPackage rec {
|
|||
postFetch = ''
|
||||
rm "$out/.git_archival.txt"
|
||||
'';
|
||||
hash = "sha256-0E+kkvxT1jLfoBg3C9BfbSqfIX3K/Z5kK1kCdOks2Hk=";
|
||||
hash = "sha256-Obsg5fsTv/7uiFRbzGp90+d90e2dX7CWMMRMgiQvNyc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyrogram";
|
||||
version = "2.0.62";
|
||||
version = "2.0.97";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
|
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||
owner = "pyrogram";
|
||||
repo = "pyrogram";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Kex9xIjcAYCzHeqWoDAIgTMuih0s42/O2zfTYxWEqbM=";
|
||||
hash = "sha256-cYwH2o2ss8qnOST8Cjh+88PNM5NTO2B11PW7mWS1ctk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
33
pkgs/development/python-modules/qpageview/default.nix
Normal file
33
pkgs/development/python-modules/qpageview/default.nix
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, buildPythonPackage
|
||||
, python3Packages
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonPackage rec {
|
||||
pname = "qpageview";
|
||||
version = "0.6.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "frescobaldi";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-XFMTOD7ums8sbFHUViEI9q6/rCjUmEtXAdd3/OmLsHU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [ pyqt5 poppler-qt5 pycups ];
|
||||
|
||||
pythonImportsCheck = [ "qpageview" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A page-based viewer widget for Qt5/PyQt5";
|
||||
homepage = "https://github.com/frescobaldi/qpageview";
|
||||
changelog = "https://github.com/frescobaldi/qpageview/blob/${src.rev}/ChangeLog";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ camillemndn ];
|
||||
};
|
||||
}
|
||||
|
|
@ -6,11 +6,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "trimesh";
|
||||
version = "3.18.1";
|
||||
version = "3.18.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-8Jw5YmHsATchcchiPqxqxA+PYgl7elqZLqG8vTu/b0k=";
|
||||
sha256 = "sha256-lVoBBBrzyhrSmR2FM0xo8UJBCOShwaYOrIpeAwQn76M=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ numpy ];
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "trove-classifiers";
|
||||
version = "2023.1.12";
|
||||
version = "2023.1.20";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-66Rg2DJg/PNkjXyKy/IgQ0T9eF+JD7rstoZKf7nwaS4=";
|
||||
hash = "sha256-7T/U4dLqd8qe03k4BYJWbmADpU1wo+VSGpsqeJZgk2I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "twitchapi";
|
||||
version = "3.4.1";
|
||||
version = "3.7.0";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
|
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
pname = "twitchAPI";
|
||||
inherit version;
|
||||
hash = "sha256-q35ijx4zDR07k9al11T1H7SPYG9M8g8+rD/TNrkL2Ek=";
|
||||
hash = "sha256-zmMzHuaSsuj2MxkmQyzROrZ/zxO0/I7llKlnpZzauDw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "webauthn";
|
||||
version = "1.6.0";
|
||||
version = "1.7.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||
owner = "duo-labs";
|
||||
repo = "py_webauthn";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Ts0zKnQg1EaBNB9xQmzOpEVwDSFwHNjIhEP1jTwEOFI=";
|
||||
hash = "sha256-iAEvWFxJGf4H2PEseG+ykt9sriGyNvbmj4+NZFcPGPk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "ddosify";
|
||||
version = "0.13.1";
|
||||
version = "0.13.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-bS/7S4PxZSTYvxLFmC486PBHNhkGUIPAnUJQztp3ouw=";
|
||||
sha256 = "sha256-56VznyGZtSYKyjQRej1QduG/99OYObYNmplsGSckgKg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-3y5ppTtvGqwWhgnVBpP4gf26DHKPnSNYK4jfhBiYDwY=";
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "mdsh";
|
||||
version = "0.6.0";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zimbatm";
|
||||
repo = "mdsh";
|
||||
rev = "v${version}";
|
||||
sha256 = "1ki6w3qf8ipcf7ch5120mj16vs7yan8k9zjd25v8x6vbsd1iccgy";
|
||||
hash = "sha256-Y8ss/aw01zpgM6Z6fCGshP21kcdSOTVG/VqL8H3tlls=";
|
||||
};
|
||||
|
||||
cargoSha256 = "0x5fd47rjmzzmwgj14gbj0rbxwbphd7f63mis4ivwlwc9ikjxdxb";
|
||||
cargoSha256 = "sha256-8o4gN6mqUU+o80IqlAYAD5qpZBSQ/FY5HoNbpwzTm0A=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Markdown shell pre-processor";
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "okteto";
|
||||
version = "2.11.1";
|
||||
version = "2.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "okteto";
|
||||
repo = "okteto";
|
||||
rev = version;
|
||||
hash = "sha256-Eprsy/wd5lMBXk3yVGhofYD9ZBfdmjGMwXZ61RMgd4k=";
|
||||
hash = "sha256-0pnPffvKcBpBir0l6rpp7iVbF9XlMTCG2mifzYkEQ7s=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Yi+4fGCHLH/kA4DuPI2uQ/27xhMd4cPFkTWlI6Bc13A=";
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ruff";
|
||||
version = "0.0.240";
|
||||
version = "0.0.241";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "charliermarsh";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-10pGcvMz+5obtk1lo2pg3D/VtBDhsVRsCZ+Tg1lp3qM=";
|
||||
sha256 = "sha256-yrwrkU19LBM3gac70Y1UamZTdamuJdrMX4U88zGgJJs=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-4u05UeMw0dX0A1SjFsaUvFgPPAFbCS4POrsZuePEafc=";
|
||||
cargoSha256 = "sha256-RzGYh0zspP+sG7k+XwDy9kaTIGIEoOEV3ZoqVf0X0GA=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "zed";
|
||||
version = "1.4.0";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "brimdata";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ias2HKwZo5Q/0M4YZI4wLgzMVWmannruXlhp8IsOuyU=";
|
||||
sha256 = "sha256-er3BPQ10ERCIBn0xx0jjyMBybnUBMyX76tqYEYe2WYQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-h5NYx6xhIh4i/tS5cGHXBomnVZCUn8jJuzL6k1+IdKk=";
|
||||
vendorHash = "sha256-3PyyR9d5m33ohbcstREvTOtWwMIrbFNvFyBY1F+6R+4=";
|
||||
|
||||
subPackages = [ "cmd/zed" "cmd/zq" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "fastly";
|
||||
version = "5.1.0";
|
||||
version = "5.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fastly";
|
||||
repo = "cli";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-IbLSNgf4uB8JFNsCXkmkK+w4qhirpd8/ALEfVzGCTUA=";
|
||||
hash = "sha256-gPToEeLymKIRjL52wb5AjMpDM6vU0Yb0rbcpouev4rQ=";
|
||||
# The git commit is part of the `fastly version` original output;
|
||||
# leave that output the same in nixpkgs. Use the `.git` directory
|
||||
# to retrieve the commit SHA, and remove the directory afterwards,
|
||||
|
|
@ -31,7 +31,7 @@ buildGoModule rec {
|
|||
"cmd/fastly"
|
||||
];
|
||||
|
||||
vendorHash = "sha256-fBU7829heM6T6Ba2r984qdd19VCuOP72jYwYCP7ECBU=";
|
||||
vendorHash = "sha256-yyptdLkC0x2npZu2oEbvSJXIWShnSrQ0n6cPrDUlrCw=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
|
|
|||
|
|
@ -16,13 +16,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "evcc";
|
||||
version = "0.112.0";
|
||||
version = "0.112.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "evcc-io";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-v8qYQLYBZJSXENJXqwxp0JeA1wuWMLCs8kOK6FOoa9c=";
|
||||
hash = "sha256-Y/Py7WTv8tiPdbPswpVhqpBW5l2XJB7T3KDm+xWfl8s=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-sfASvLsNUp+7T0ib87HkLNBDp5fbk3hEV0LIKK46O4g=";
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, installShellFiles
|
||||
, testers
|
||||
, vsmtp
|
||||
|
|
@ -9,30 +8,20 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "vsmtp";
|
||||
version = "2.0.0";
|
||||
version = "2.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "viridIT";
|
||||
repo = "vsmtp";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-uyu2NpHFDqJDcfQukG6TdRH7KuZnrYTULvLiABdvAog=";
|
||||
hash = "sha256-FI4BvU+83nTzRLJQZ1l1eOn41ZeA62Db+p3d//5o0Wk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/viridIT/vSMTP/pull/952
|
||||
# treewide: set GIT_HASH to unknown if git rev-parse HEAD fails
|
||||
(fetchpatch {
|
||||
url = "https://github.com/viridIT/vSMTP/commit/0ac4820c079e459f515825dfb451980119eaae9e.patch";
|
||||
includes = [ "src/vsmtp/vsmtp-core/build.rs" "src/vqueue/build.rs" ];
|
||||
hash = "sha256-kGjXsVokP6039rksaxw1EM/0zOlKIus1EaIEsFJvLE8=";
|
||||
})
|
||||
];
|
||||
|
||||
cargoHash = "sha256-A0Q6ciZJL13VzJgZIWZalrRElSNGHUN/9b8Csj4Tdak=";
|
||||
cargoHash = "sha256-Qhhh0riM1qeD3/JZINvY0t5fEOj+prI0fyXagdR43sc=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
# too many upstream failures
|
||||
# tests do not run well in the nix sandbox
|
||||
doCheck = false;
|
||||
|
||||
postInstall = ''
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ lib, stdenv, fetchFromGitHub, buildGoModule, makeWrapper, runCommand
|
||||
, cacert, moreutils, jq, git, pkg-config, yarn, python3
|
||||
, esbuild, nodejs-16_x-openssl_1_1, libsecret, xorg, ripgrep
|
||||
, esbuild, nodejs-16_x, libsecret, xorg, ripgrep
|
||||
, AppKit, Cocoa, Security, cctools }:
|
||||
|
||||
let
|
||||
system = stdenv.hostPlatform.system;
|
||||
|
||||
nodejs = nodejs-16_x-openssl_1_1;
|
||||
nodejs = nodejs-16_x;
|
||||
yarn' = yarn.override { inherit nodejs; };
|
||||
defaultYarnOpts = [ "frozen-lockfile" "non-interactive" "no-progress"];
|
||||
|
||||
|
|
@ -40,19 +40,19 @@ let
|
|||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "openvscode-server";
|
||||
version = "1.73.1";
|
||||
version = "1.74.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gitpod-io";
|
||||
repo = "openvscode-server";
|
||||
rev = "openvscode-server-v${version}";
|
||||
sha256 = "DZWAzNRRRZ/eElwRGvSK7TxstKK6X1Tj+uAxD4SOScQ=";
|
||||
sha256 = "2+/5I0dpQsmoWA7Q0dCgPO85dkOKQWHeO34cueH4sjQ=";
|
||||
};
|
||||
|
||||
yarnCache = stdenv.mkDerivation {
|
||||
name = "${pname}-${version}-${system}-yarn-cache";
|
||||
inherit src;
|
||||
nativeBuildInputs = [ cacert yarn git ];
|
||||
nativeBuildInputs = [ cacert yarn' git ];
|
||||
buildPhase = ''
|
||||
export HOME=$PWD
|
||||
|
||||
|
|
@ -69,7 +69,7 @@ in stdenv.mkDerivation rec {
|
|||
|
||||
outputHashMode = "recursive";
|
||||
outputHashAlgo = "sha256";
|
||||
outputHash = "sha256-7UBXigQj7c+fuHPIM5BbRe02DuL+cs6VbQ/D84Yk8i4=";
|
||||
outputHash = "sha256-4B/ESi4lM2p+pY0dfUKWgwmYkwqPYaNuCLJ99ByjwWE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -142,6 +142,8 @@ in stdenv.mkDerivation rec {
|
|||
jq "del(.scripts) | .gypfile = false" ./package.json | sponge ./package.json
|
||||
popd
|
||||
'' + ''
|
||||
export NODE_OPTIONS=--openssl-legacy-provider
|
||||
|
||||
# rebuild binaries, we use npm here, as yarn does not provide an alternative
|
||||
# that would not attempt to try to reinstall everything and break our
|
||||
# patching attempts
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "vikunja-api";
|
||||
version = "0.20.1";
|
||||
version = "0.20.2";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "kolaente.dev";
|
||||
owner = "vikunja";
|
||||
repo = "api";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-KBUN/vBm2st5mfqmrwUv8w4QcgSKerfY51LQbWRn7To=";
|
||||
sha256 = "sha256-VSzjP6fC9zxUnY3ZhapRUXUS4V7+BVvXJKrxm71CK4o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs =
|
||||
|
|
@ -24,7 +24,7 @@ buildGoModule rec {
|
|||
'';
|
||||
in [ fakeGit mage ];
|
||||
|
||||
vendorSha256 = "sha256-ke4jhOhD24zSpQI1nxKoJ05yN/SfCku+wiNuDKr78rw=";
|
||||
vendorSha256 = "sha256-8qaEMHBZcop1wH3tmNKAAMEYA4qrE6dlwxhRsCDeZaY=";
|
||||
|
||||
# checks need to be disabled because of needed internet for some checks
|
||||
doCheck = false;
|
||||
|
|
@ -48,6 +48,7 @@ buildGoModule rec {
|
|||
passthru.tests.vikunja = nixosTests.vikunja;
|
||||
|
||||
meta = {
|
||||
changelog = "https://kolaente.dev/vikunja/api/src/tag/v${version}/CHANGELOG.md";
|
||||
description = "API of the Vikunja to-do list app";
|
||||
homepage = "https://vikunja.io/";
|
||||
license = lib.licenses.agpl3Plus;
|
||||
|
|
|
|||
|
|
@ -2,10 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vikunja-frontend";
|
||||
version = "0.20.2";
|
||||
version = "0.20.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dl.vikunja.io/frontend/${pname}-${version}.zip";
|
||||
sha256 = "sha256-7WvitR40eJPPdqwZm8C7spvEIdFIY3SGc/w4VY7spgk=";
|
||||
sha256 = "sha256-+VtdgbJaXcPlO70Gqsur6osBb7iAvVnPv2iaHbs2Rmk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
|
@ -24,6 +25,7 @@ stdenv.mkDerivation rec {
|
|||
passthru.tests.vikunja = nixosTests.vikunja;
|
||||
|
||||
meta = {
|
||||
changelog = "https://kolaente.dev/vikunja/frontend/src/tag/v${version}/CHANGELOG.md";
|
||||
description = "Frontend of the Vikunja to-do list app";
|
||||
homepage = "https://vikunja.io/";
|
||||
license = lib.licenses.agpl3Plus;
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "abcMIDI";
|
||||
version = "2023.01.08";
|
||||
version = "2023.01.21";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip";
|
||||
hash = "sha256-PUaGjZFMYwG9BduIgmzhi5DTkGfSN9VtAUkqrAZ2xbo=";
|
||||
hash = "sha256-BantnVvIGJ3BKAKjK/6JQS1Kk1E8PDJFP/WuOjYbSy8=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -12,16 +12,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "nurl";
|
||||
version = "0.3.6";
|
||||
version = "0.3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nix-community";
|
||||
repo = "nurl";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-AJHmHTkKHd99GCBlVv2t8Q9kUlCtOcK+ukYzEs5U3S4=";
|
||||
hash = "sha256-TtH0sfWFWe3oYK/8jJslqjrEY5rR7HGAVDD5iQ2+spY=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-0QUuYNzKN8dbGiJq2JxElR39zIlqvHXjPzT1dGc6cRM=";
|
||||
cargoSha256 = "sha256-vwLlqRjiJU3ecLURAZabmIBivYW1zAfMLUhaJzh57ig=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "dnscrypt-proxy2";
|
||||
version = "2.1.2";
|
||||
version = "2.1.3";
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
|
|
@ -12,7 +12,7 @@ buildGoModule rec {
|
|||
owner = "DNSCrypt";
|
||||
repo = "dnscrypt-proxy";
|
||||
rev = version;
|
||||
sha256 = "sha256-vFUbsgLgwQGb/2rValFRuZXguxyAJzOBMLnbVs0swes=";
|
||||
sha256 = "sha256-5wfxjx8SxynY6DpPIvOLwSsBdM/0zSzfaVDQTI/RUD0=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
31
pkgs/tools/text/mdbook-emojicodes/default.nix
Normal file
31
pkgs/tools/text/mdbook-emojicodes/default.nix
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, stdenv
|
||||
, darwin
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "mdbook-emojicodes";
|
||||
version = "0.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "blyxyas";
|
||||
repo = "mdbook-emojicodes";
|
||||
rev = "${version}.1";
|
||||
hash = "sha256-SWT01R/+FuzkkOUd/2wpRo0HIaPEtzDelTSh7ewo9gQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-z9UKBBCr8R1I9k48JsEBnVokQDfaj9lt+qfIUvJ/5lE=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.CoreFoundation
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "MDBook preprocessor for converting emojicodes (e.g. `: cat :`) into emojis 🐱";
|
||||
homepage = "https://github.com/blyxyas/mdbook-emojicodes";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ blaggacao ];
|
||||
};
|
||||
}
|
||||
|
|
@ -2482,6 +2482,8 @@ with pkgs;
|
|||
|
||||
sakura = callPackage ../applications/terminal-emulators/sakura { };
|
||||
|
||||
scriv = callPackage ../applications/version-management/scriv { };
|
||||
|
||||
st = callPackage ../applications/terminal-emulators/st {
|
||||
conf = config.st.conf or null;
|
||||
patches = config.st.patches or [];
|
||||
|
|
@ -9025,6 +9027,8 @@ with pkgs;
|
|||
inherit (darwin.apple_sdk.frameworks) CoreServices;
|
||||
};
|
||||
|
||||
mdbook-emojicodes = callPackage ../tools/text/mdbook-emojicodes { };
|
||||
|
||||
mdbook-epub = callPackage ../tools/text/mdbook-epub {
|
||||
inherit (darwin.apple_sdk.frameworks) CoreServices;
|
||||
};
|
||||
|
|
@ -24881,6 +24885,8 @@ with pkgs;
|
|||
|
||||
mir = callPackage ../servers/mir { };
|
||||
|
||||
miriway = callPackage ../applications/window-managers/miriway { };
|
||||
|
||||
icinga2 = callPackage ../servers/monitoring/icinga2 { };
|
||||
|
||||
icinga2-agent = callPackage ../servers/monitoring/icinga2 {
|
||||
|
|
@ -34486,6 +34492,8 @@ with pkgs;
|
|||
|
||||
tessera = callPackage ../applications/blockchains/tessera { };
|
||||
|
||||
ton = callPackage ../applications/blockchains/ton { };
|
||||
|
||||
torq = callPackage ../applications/blockchains/torq { };
|
||||
|
||||
vertcoin = libsForQt5.callPackage ../applications/blockchains/vertcoin {
|
||||
|
|
|
|||
|
|
@ -6979,6 +6979,8 @@ self: super: with self; {
|
|||
|
||||
peewee = callPackage ../development/python-modules/peewee { };
|
||||
|
||||
peewee-migrate = callPackage ../development/python-modules/peewee-migrate { };
|
||||
|
||||
pefile = callPackage ../development/python-modules/pefile { };
|
||||
|
||||
pelican = callPackage ../development/python-modules/pelican {
|
||||
|
|
@ -9731,6 +9733,8 @@ self: super: with self; {
|
|||
|
||||
qnapstats = callPackage ../development/python-modules/qnapstats { };
|
||||
|
||||
qpageview = callPackage ../development/python-modules/qpageview { };
|
||||
|
||||
qrcode = callPackage ../development/python-modules/qrcode { };
|
||||
|
||||
qreactor = callPackage ../development/python-modules/qreactor { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue