Merge master into staging-next
This commit is contained in:
@@ -329,6 +329,9 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
|
||||
# Kakoune
|
||||
/pkgs/applications/editors/kakoune @philiptaron
|
||||
|
||||
# LuaPackages
|
||||
/pkgs/development/lua-modules @NixOS/lua
|
||||
|
||||
# Neovim
|
||||
/pkgs/applications/editors/neovim @NixOS/neovim
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,111 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
rust,
|
||||
rustPlatform,
|
||||
hdr10plus_tool,
|
||||
cargo-c,
|
||||
fontconfig,
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (lib) optionals concatStringsSep;
|
||||
inherit (rust.envVars) setEnv;
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
__structuredAttrs = true;
|
||||
|
||||
pname = "hdr10plus";
|
||||
version = "2.1.3";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
];
|
||||
|
||||
inherit (hdr10plus_tool)
|
||||
src
|
||||
useFetchCargoVendor
|
||||
cargoDeps
|
||||
cargoHash
|
||||
;
|
||||
|
||||
nativeBuildInputs = [ cargo-c ];
|
||||
buildInputs = [ fontconfig ];
|
||||
|
||||
cargoCFlags = [
|
||||
"--package=hdr10plus"
|
||||
"--frozen"
|
||||
"--prefix=${placeholder "out"}"
|
||||
"--includedir=${placeholder "dev"}/include"
|
||||
"--pkgconfigdir=${placeholder "dev"}/lib/pkgconfig"
|
||||
"--target=${stdenv.hostPlatform.rust.rustcTarget}"
|
||||
];
|
||||
|
||||
# mirror Cargo flags
|
||||
cargoCBuildFlags =
|
||||
optionals (finalAttrs.cargoBuildType != "debug") [
|
||||
"--profile=${finalAttrs.cargoBuildType}"
|
||||
]
|
||||
++ optionals (finalAttrs.cargoBuildNoDefaultFeatures) [
|
||||
"--no-default-features"
|
||||
]
|
||||
++ optionals (finalAttrs.cargoBuildFeatures != [ ]) [
|
||||
"--features=${concatStringsSep "," finalAttrs.cargoBuildFeatures}"
|
||||
];
|
||||
|
||||
cargoCTestFlags =
|
||||
optionals (finalAttrs.cargoCheckType != "debug") [
|
||||
"--profile=${finalAttrs.cargoCheckType}"
|
||||
]
|
||||
++ optionals (finalAttrs.cargoCheckNoDefaultFeatures) [
|
||||
"--no-default-features"
|
||||
]
|
||||
++ optionals (finalAttrs.cargoCheckFeatures != [ ]) [
|
||||
"--features=${concatStringsSep "," finalAttrs.cargoCheckFeatures}"
|
||||
];
|
||||
|
||||
configurePhase = ''
|
||||
# let stdenv handle stripping
|
||||
export "CARGO_PROFILE_''${cargoBuildType@U}_STRIP"=false
|
||||
|
||||
prependToVar cargoCFlags -j "$NIX_BUILD_CORES"
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
${setEnv} cargo cbuild "''${cargoCFlags[@]}" "''${cargoCBuildFlags[@]}"
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
${setEnv} cargo ctest "''${cargoCFlags[@]}" "''${cargoCTestFlags[@]}"
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
${setEnv} cargo cinstall "''${cargoCFlags[@]}" "''${cargoCBuildFlags[@]}"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
inherit hdr10plus_tool;
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Library to work with HDR10+ in HEVC files";
|
||||
homepage = "https://github.com/quietvoid/hdr10plus_tool";
|
||||
changelog = "https://github.com/quietvoid/hdr10plus_tool/releases/tag/${hdr10plus_tool.version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ mvs ];
|
||||
pkgConfigModules = [ "hdr10plus-rs" ];
|
||||
};
|
||||
})
|
||||
@@ -5,7 +5,11 @@
|
||||
pkg-config,
|
||||
fontconfig,
|
||||
writableTmpDirAsHomeHook,
|
||||
nix-update-script,
|
||||
writeShellApplication,
|
||||
hdr10plus,
|
||||
nixVersions,
|
||||
nix-update,
|
||||
tomlq,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
@@ -31,9 +35,21 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
export FONTCONFIG_FILE="${fontconfig.out}/etc/fonts/fonts.conf";
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
passthru.updateScript = lib.getExe (writeShellApplication {
|
||||
name = "update-${finalAttrs.pname}";
|
||||
runtimeInputs = [
|
||||
nixVersions.latest
|
||||
nix-update
|
||||
tomlq
|
||||
];
|
||||
|
||||
text = ''
|
||||
nix-update ${finalAttrs.pname}
|
||||
src="$(nix eval -f . --raw ${finalAttrs.pname}.src)"
|
||||
libver="$(tq -f "$src/hdr10plus/Cargo.toml" package.version)"
|
||||
nix-update ${hdr10plus.pname} --version "$libver"
|
||||
'';
|
||||
});
|
||||
|
||||
meta = {
|
||||
description = "CLI utility to work with HDR10+ in HEVC files.";
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hyprland-protocols";
|
||||
version = "0.6.3";
|
||||
version = "0.6.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hyprwm";
|
||||
repo = "hyprland-protocols";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-yf+AXt0RkAkCyF6iSnJt6EJAnNG/l6qv70CVzhRP6Bg=";
|
||||
hash = "sha256-yt8F7NhMFCFHUHy/lNjH/pjZyIDFNk52Q4tivQ31WFo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -10,17 +10,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "inputplumber";
|
||||
version = "0.50.0";
|
||||
version = "0.52.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ShadowBlip";
|
||||
repo = "InputPlumber";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-sB3w9323lOw4wz/7wUu77mxiIjiuuAi5+j+MAK3rP7M=";
|
||||
hash = "sha256-Jgy6fHR1gdRX6HGMSA6QkoNq9eZBwM4P3f972CwsGUk=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-zB1CM65OSQar8pY5I89eByNX8vEEwqIGvaGAxWhxTDM=";
|
||||
cargoHash = "sha256-/E2pmz1ohYQouLDnBCUYfpRWMc+rNEZ0FJR+RsSli04=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -50,15 +50,16 @@ PKG_LIST = "maintainers/scripts/luarocks-packages.csv"
|
||||
TMP_FILE = "$(mktemp)"
|
||||
GENERATED_NIXFILE = "pkgs/development/lua-modules/generated-packages.nix"
|
||||
|
||||
HEADER = """/* {GENERATED_NIXFILE} is an auto-generated file -- DO NOT EDIT!
|
||||
Regenerate it with: nix run nixpkgs#luarocks-packages-updater
|
||||
You can customize the generated packages in pkgs/development/lua-modules/overrides.nix
|
||||
HEADER = """/*
|
||||
{GENERATED_NIXFILE} is an auto-generated file -- DO NOT EDIT!
|
||||
Regenerate it with: nix run nixpkgs#luarocks-packages-updater
|
||||
You can customize the generated packages in pkgs/development/lua-modules/overrides.nix
|
||||
*/
|
||||
""".format(GENERATED_NIXFILE=GENERATED_NIXFILE)
|
||||
|
||||
FOOTER = """
|
||||
}
|
||||
/* GENERATED - do not edit this file */
|
||||
# GENERATED - do not edit this file
|
||||
"""
|
||||
|
||||
|
||||
@@ -118,10 +119,16 @@ class LuaEditor(pluginupdate.Editor):
|
||||
with tempfile.NamedTemporaryFile("w+") as f:
|
||||
f.write(HEADER)
|
||||
header2 = textwrap.dedent(
|
||||
"""
|
||||
{ stdenv, lib, fetchurl, fetchgit, callPackage, ... }:
|
||||
final: prev:
|
||||
{
|
||||
"""
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchurl,
|
||||
fetchgit,
|
||||
callPackage,
|
||||
...
|
||||
}:
|
||||
final: prev: {
|
||||
"""
|
||||
)
|
||||
f.write(header2)
|
||||
@@ -231,7 +238,8 @@ def generate_pkg_nix(plug: LuaPlugin):
|
||||
log.debug("running %s", " ".join(cmd))
|
||||
|
||||
output = subprocess.check_output(cmd, text=True)
|
||||
output = "callPackage(" + output.strip() + ") {};\n\n"
|
||||
## FIXME: luarocks nix command output isn't formatted properly
|
||||
output = "callPackage(\n" + output.strip() + ") {};\n\n"
|
||||
return (plug, output, None)
|
||||
except subprocess.CalledProcessError as e:
|
||||
log.error("Failed to generate nix expression for %s: %s", plug.name, e)
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "mediawiki";
|
||||
version = "1.43.0";
|
||||
version = "1.43.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://releases.wikimedia.org/mediawiki/${lib.versions.majorMinor version}/mediawiki-${version}.tar.gz";
|
||||
hash = "sha256-VuCn/i/3jlC5yHs9WJ8tjfW8qwAY5FSypKI5yFhr2O4=";
|
||||
hash = "sha256-PIWqnEzWw1PGeASjpY57eWFdQUHD1msQHl8660BlPWw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
}:
|
||||
let
|
||||
pname = "nuclear";
|
||||
version = "0.6.43";
|
||||
version = "0.6.46";
|
||||
|
||||
src = fetchurl {
|
||||
# Nuclear currently only publishes AppImage releases for x86_64, which is hardcoded in
|
||||
@@ -13,7 +13,7 @@ let
|
||||
# provide more arches, we should use stdenv.hostPlatform to determine the arch and choose
|
||||
# source URL accordingly.
|
||||
url = "https://github.com/nukeop/nuclear/releases/download/v${version}/${pname}-v${version}-x86_64.AppImage";
|
||||
hash = "sha256-kruQ9h/0dYWIsjX8P2Em7v5weGd4B5hZbu/VldeAGRU=";
|
||||
hash = "sha256-2oamA2T/Fq9TpqrNFByiL+ns12BaWMy3wptYEo5SIXg=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extract { inherit pname version src; };
|
||||
|
||||
@@ -17,7 +17,7 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "podman-desktop";
|
||||
version = "1.17.1";
|
||||
version = "1.17.2";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "containers";
|
||||
repo = "podman-desktop";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-7lqBS5iasLGsF3+2fZ19ksCOK3VvNFuBMdZs94vP3PI=";
|
||||
hash = "sha256-AbOR+iCV11OVEzNGRjyJ9+BAMuWkywMNR6dPiLe0quI=";
|
||||
};
|
||||
|
||||
pnpmDeps = pnpm_9.fetchDeps {
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
nasm,
|
||||
cpuinfo,
|
||||
libdovi,
|
||||
hdr10plus,
|
||||
unstableGitUpdater,
|
||||
}:
|
||||
|
||||
@@ -33,8 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
{
|
||||
USE_EXTERNAL_CPUINFO = true;
|
||||
LIBDOVI_FOUND = true;
|
||||
# enable when libhdr10plus is available
|
||||
# LIBHDR10PLUS_RS_FOUND = true;
|
||||
LIBHDR10PLUS_RS_FOUND = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -45,6 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
buildInputs = [
|
||||
cpuinfo
|
||||
libdovi
|
||||
hdr10plus
|
||||
];
|
||||
|
||||
passthru.updateScript = unstableGitUpdater {
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkYaziPlugin {
|
||||
pname = "bypass.yazi";
|
||||
version = "0-unstable-2025-02-16";
|
||||
version = "0-unstable-2025-04-09";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Rolv-Apneseth";
|
||||
repo = "bypass.yazi";
|
||||
rev = "ecb1f7f6fd305ff4ffff548fa955595af6b26e60";
|
||||
hash = "sha256-XXp4XflrVrs8FrUCRUbSxWZTSGPrIGrpqvB1pARerKQ=";
|
||||
rev = "2ab6d84e8165985dd4d63ef0098e3a30feb3a41a";
|
||||
hash = "sha256-6LiBUvHmN8q/ao1+QhCg75ypuf1i6MyRQiU16Lb8pEs=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -0,0 +1,23 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
mkYaziPlugin,
|
||||
}:
|
||||
mkYaziPlugin {
|
||||
pname = "duckdb.yazi";
|
||||
version = "25.4.8-unstable-2025-04-08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wylie102";
|
||||
repo = "duckdb.yazi";
|
||||
rev = "eaa748c62e24f593104569d2dc15d50b1d48497b";
|
||||
hash = "sha256-snQ+n7n+71mqAsdzrXcI2v7Bg0trrbiHv3mIAxldqlc=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Yazi plugin that uses duckdb to preview data files.";
|
||||
homepage = "https://github.com/wylie102/duckdb.yazi";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ khaneliman ];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,23 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
mkYaziPlugin,
|
||||
}:
|
||||
mkYaziPlugin {
|
||||
pname = "lazygit.yazi";
|
||||
version = "0-unstable-2025-03-31";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Lil-Dank";
|
||||
repo = "lazygit.yazi";
|
||||
rev = "7a08a0988c2b7481d3f267f3bdc58080e6047e7d";
|
||||
hash = "sha256-OJJPgpSaUHYz8a9opVLCds+VZsK1B6T+pSRJyVgYNy8=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Lazygit plugin for yazi.";
|
||||
homepage = "https://github.com/Lil-Dank/lazygit.yazi";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ khaneliman ];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,23 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
mkYaziPlugin,
|
||||
}:
|
||||
mkYaziPlugin {
|
||||
pname = "projects.yazi";
|
||||
version = "0-unstable-2025-03-02";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MasouShizuka";
|
||||
repo = "projects.yazi";
|
||||
rev = "4f11eccf835556600a37730b383ee12f00d4fc59";
|
||||
hash = "sha256-XHGlQn0Nsxh/WScz4v2I+IWvzGJ9QTXbB7zgSCPQ+E0=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "A yazi plugin that adds the functionality to save and load projects.";
|
||||
homepage = "https://github.com/MasouShizuka/projects.yazi";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ khaneliman ];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,23 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
mkYaziPlugin,
|
||||
}:
|
||||
mkYaziPlugin {
|
||||
pname = "rich-preview.yazi";
|
||||
version = "0-unstable-2025-01-18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AnirudhG07";
|
||||
repo = "rich-preview.yazi";
|
||||
rev = "2559e5fa7c1651dbe7c5615ef6f3b5291347d81a";
|
||||
hash = "sha256-dW2gAAv173MTcQdqMV32urzfrsEX6STR+oCJoRVGGpA=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Preview file types using rich in Yazi.";
|
||||
homepage = "https://github.com/AnirudhG07/rich-preview.yazi";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ khaneliman ];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,23 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
mkYaziPlugin,
|
||||
}:
|
||||
mkYaziPlugin {
|
||||
pname = "time-travel.yazi";
|
||||
version = "0-unstable-2025-03-02";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "iynaix";
|
||||
repo = "time-travel.yazi";
|
||||
rev = "7e0179e15a41a4a42b6d0b5fa6dd240c9b4cf0d2";
|
||||
hash = "sha256-ZZgn5rsBzvZcnDWZfjMBPRg9QUz4FTq5UIPWfnwXHQs=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "A yazi plugin for browsing backwards and forwards in time via BTRFS / ZFS snapshots.";
|
||||
homepage = "https://github.com/iynaix/time-travel.yazi";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ khaneliman ];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,23 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
mkYaziPlugin,
|
||||
}:
|
||||
mkYaziPlugin {
|
||||
pname = "yatline.yazi";
|
||||
version = "0-unstable-2025-03-05";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "imsi32";
|
||||
repo = "yatline.yazi";
|
||||
rev = "6b0fc1ef5eca034460b4c69cb87c424103227a2e";
|
||||
hash = "sha256-JiUik4umi+ujsJmHliUbLsIj7ZTKayrWAAM8HmRdjwk=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Yazi plugin for customizing both header-line and status-line.";
|
||||
homepage = "https://github.com/imsi32/yatline.yazi";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ khaneliman ];
|
||||
};
|
||||
}
|
||||
@@ -815,15 +815,15 @@ final: prev: {
|
||||
}:
|
||||
buildLuarocksPackage {
|
||||
pname = "fzf-lua";
|
||||
version = "0.0.1815-1";
|
||||
version = "0.0.1823-1";
|
||||
knownRockspec =
|
||||
(fetchurl {
|
||||
url = "mirror://luarocks/fzf-lua-0.0.1815-1.rockspec";
|
||||
sha256 = "0nihsjmwvf3v0v3wqnwbn5563q28iq64mwgif2kl7hrmkm1r68na";
|
||||
url = "mirror://luarocks/fzf-lua-0.0.1823-1.rockspec";
|
||||
sha256 = "0icbchqxr546j21xq2f6w122xkcmqgpg9pywlip8xjj8vsdfx6n6";
|
||||
}).outPath;
|
||||
src = fetchzip {
|
||||
url = "https://github.com/ibhagwan/fzf-lua/archive/caee13203d6143d691710c34f85ad6441fe3f535.zip";
|
||||
sha256 = "0ddkgml971j4rz0fhhg7s9sj1wbgyj8b9rjy32wrc681bwy01qx2";
|
||||
url = "https://github.com/ibhagwan/fzf-lua/archive/47b85a25c0c0b2c20b4e75199ed01bb71e7814f5.zip";
|
||||
sha256 = "1znlhvb84x3lipa5n1cdk1kpid49h647hnnwy01xw447vk49p11p";
|
||||
};
|
||||
|
||||
disabled = luaOlder "5.1";
|
||||
@@ -904,15 +904,15 @@ final: prev: {
|
||||
}:
|
||||
buildLuarocksPackage {
|
||||
pname = "haskell-tools.nvim";
|
||||
version = "4.4.3-1";
|
||||
version = "5.0.0-1";
|
||||
knownRockspec =
|
||||
(fetchurl {
|
||||
url = "mirror://luarocks/haskell-tools.nvim-4.4.3-1.rockspec";
|
||||
sha256 = "1qc6ny0pw4098d2i3wkmcw1qb88jhvbjfabm40x5n0rv3jqkaij9";
|
||||
url = "mirror://luarocks/haskell-tools.nvim-5.0.0-1.rockspec";
|
||||
sha256 = "0ps1aqz344b2kc0p5zs70i4n9s07fnc5b2kxdbyj1x8cn3ndv959";
|
||||
}).outPath;
|
||||
src = fetchzip {
|
||||
url = "https://github.com/mrcjkb/haskell-tools.nvim/archive/v4.4.3.zip";
|
||||
sha256 = "002lzdjdf9f5jp63bngmp9fadzs81c0w0gqqpy7b2wfxg76biggr";
|
||||
url = "https://github.com/mrcjkb/haskell-tools.nvim/archive/v5.0.0.zip";
|
||||
sha256 = "0xwxxwcn775yjqjs90mr1qs9hf5dyqxhkii38yfq1cv5w8bnlrff";
|
||||
};
|
||||
|
||||
disabled = luaOlder "5.1";
|
||||
@@ -1078,11 +1078,11 @@ final: prev: {
|
||||
}:
|
||||
buildLuarocksPackage {
|
||||
pname = "jsregexp";
|
||||
version = "0.0.7-1";
|
||||
version = "0.0.7-2";
|
||||
knownRockspec =
|
||||
(fetchurl {
|
||||
url = "mirror://luarocks/jsregexp-0.0.7-1.rockspec";
|
||||
sha256 = "1yx0340h51xk23n0g8irj5c9bs35zy6p1zl5kp7vy2cwxazbipbl";
|
||||
url = "mirror://luarocks/jsregexp-0.0.7-2.rockspec";
|
||||
sha256 = "048gaxgm45hvqz8x2sp3bjii2fgimwafccnwvf92crlj3r6cys6k";
|
||||
}).outPath;
|
||||
src = fetchFromGitHub {
|
||||
owner = "kmarius";
|
||||
@@ -2225,17 +2225,17 @@ final: prev: {
|
||||
}:
|
||||
buildLuarocksPackage {
|
||||
pname = "lua-zlib";
|
||||
version = "1.2-2";
|
||||
version = "1.3-0";
|
||||
knownRockspec =
|
||||
(fetchurl {
|
||||
url = "mirror://luarocks/lua-zlib-1.2-2.rockspec";
|
||||
sha256 = "1ycjy59w6rkhasqqbiyra0f1sj87fswcz25zwxy4gyv7rrwy5hxd";
|
||||
url = "mirror://luarocks/lua-zlib-1.3-0.rockspec";
|
||||
sha256 = "06mkh54k009bvn7xl8fbxl574n7zqk3ki04f0xbsc8an5w9bw1l8";
|
||||
}).outPath;
|
||||
src = fetchFromGitHub {
|
||||
owner = "brimworks";
|
||||
repo = "lua-zlib";
|
||||
rev = "v1.2";
|
||||
hash = "sha256-3gDYO4KcGUmcJFV22NDXWrFDwHNmPvMp++iXrz+QbC0=";
|
||||
rev = "v1.3";
|
||||
hash = "sha256-FjhI8i2yP4aeZGakFL+vuWKAdISTkdt1mPKl8GIecVM=";
|
||||
};
|
||||
|
||||
disabled = luaOlder "5.1";
|
||||
@@ -2730,13 +2730,13 @@ final: prev: {
|
||||
knownRockspec =
|
||||
(fetchurl {
|
||||
url = "mirror://luarocks/lualine.nvim-scm-1.rockspec";
|
||||
sha256 = "1ss3g2435xiz6ql12dnkdzs6qyb71gvk46ny3bgrcr4d34gd7j0c";
|
||||
sha256 = "044bnw2phsxjsxkraaq9phj932f2f7vsbvfa91p7qfp2yjshixjf";
|
||||
}).outPath;
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-lualine";
|
||||
repo = "lualine.nvim";
|
||||
rev = "482ae358c67aec2a4939d68a1a4fe4c8064ccd16";
|
||||
hash = "sha256-zVRE9a+ojQUHdaPL0CWqHKepFdO417KazahbdJPym6g=";
|
||||
rev = "0ea56f91b7f51a37b749c050a5e5dfdd56b302b3";
|
||||
hash = "sha256-VSWWvhnaeNoeM7U1SwerL8vqu81eg8YJtLnJDdEjvzY=";
|
||||
};
|
||||
|
||||
disabled = luaOlder "5.1";
|
||||
@@ -3213,17 +3213,17 @@ final: prev: {
|
||||
}:
|
||||
buildLuarocksPackage {
|
||||
pname = "luasystem";
|
||||
version = "0.5.1-1";
|
||||
version = "0.6.0-1";
|
||||
knownRockspec =
|
||||
(fetchurl {
|
||||
url = "mirror://luarocks/luasystem-0.5.1-1.rockspec";
|
||||
sha256 = "0aiav3a3gw9l3gxxlq6ak6vigqqg0z9iyfq28knfm8rb23bvyi60";
|
||||
url = "mirror://luarocks/luasystem-0.6.0-1.rockspec";
|
||||
sha256 = "0pbjxfa56wy2bzs3q0bsxv27m8l2f3p2frvkprah2n708pxzi84s";
|
||||
}).outPath;
|
||||
src = fetchFromGitHub {
|
||||
owner = "lunarmodules";
|
||||
repo = "luasystem";
|
||||
rev = "v0.5.1";
|
||||
hash = "sha256-+dkXf4F2mZgQSRQRpJnjwo5Swi06Pi2BQjjY5p3PQGc=";
|
||||
rev = "v0.6.0";
|
||||
hash = "sha256-xhMdtI8tVBIQ4hsGe3l9z/ywJTvJhtGoE9hVnzvrTGc=";
|
||||
};
|
||||
|
||||
disabled = luaOlder "5.1";
|
||||
@@ -3807,26 +3807,29 @@ final: prev: {
|
||||
mimetypes = callPackage (
|
||||
{
|
||||
buildLuarocksPackage,
|
||||
fetchFromGitHub,
|
||||
fetchurl,
|
||||
luaOlder,
|
||||
}:
|
||||
buildLuarocksPackage {
|
||||
pname = "mimetypes";
|
||||
version = "1.0.0-3";
|
||||
version = "1.1.0-2";
|
||||
knownRockspec =
|
||||
(fetchurl {
|
||||
url = "mirror://luarocks/mimetypes-1.0.0-3.rockspec";
|
||||
sha256 = "02f5x5pkz6fba71mp031arrgmddsyivn5fsa0pj3q3a7nxxpmnq9";
|
||||
url = "mirror://luarocks/mimetypes-1.1.0-2.rockspec";
|
||||
sha256 = "1asi5dlkqml9rjh2k2iq0fy2khdlc7mq4kxp4j42c8507w9dijww";
|
||||
}).outPath;
|
||||
src = fetchurl {
|
||||
url = "https://github.com/lunarmodules/lua-mimetypes/archive/v1.0.0/lua-mimetypes-1.0.0.tar.gz";
|
||||
sha256 = "1rc5lnzvw4cg8wxn4w4sar2xgf5vaivdd2hgpxxcqfzzcmblg1zk";
|
||||
src = fetchFromGitHub {
|
||||
owner = "lunarmodules";
|
||||
repo = "lua-mimetypes";
|
||||
rev = "v1.1.0";
|
||||
hash = "sha256-9uuhMerMqE/AtFFGNIWxGBN0BQ+FE+NgZa3g041lesE=";
|
||||
};
|
||||
|
||||
disabled = luaOlder "5.1";
|
||||
|
||||
meta = {
|
||||
homepage = "https://github/lunarmodules/lua-mimetypes/";
|
||||
homepage = "https://github.com/lunarmodules/lua-mimetypes";
|
||||
description = "A simple library for looking up the MIME types of files.";
|
||||
license.fullName = "MIT/X11";
|
||||
};
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "marko";
|
||||
version = "2.1.2";
|
||||
version = "2.1.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "frostming";
|
||||
repo = "marko";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-KqdBYmlVs00atXy7MSsriRBnL7w13io2oFZ0IyJ2Om4=";
|
||||
hash = "sha256-rYWBVcDUH0vNPDxSIwiRSWFfPZ7ahe4Z+Sl96tNMDN8=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
@@ -49,7 +49,7 @@ buildPythonPackage rec {
|
||||
++ optional-dependencies.codehilite;
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/frostming/marko/blob/${src.rev}/CHANGELOG.md";
|
||||
changelog = "https://github.com/frostming/marko/blob/${src.tag}/CHANGELOG.md";
|
||||
description = "Markdown parser with high extensibility";
|
||||
homepage = "https://github.com/frostming/marko";
|
||||
license = lib.licenses.mit;
|
||||
|
||||
@@ -8,19 +8,19 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "viceroy";
|
||||
version = "0.12.3";
|
||||
version = "0.12.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fastly";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-NmXBD/BEQnAH4ES5SYwf8fInC4k++JX2OIhvusLlmG8=";
|
||||
hash = "sha256-mx6zqSuSePvBf7AL807+CzhST5wpmGuuRgFYvhD08Vo=";
|
||||
};
|
||||
|
||||
buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security;
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-vWbPpU3SWkS2ayp1Dr3L/GDqtjKx21KXt+vF9ViHKzc=";
|
||||
cargoHash = "sha256-jW7iWe3hYNeEv5kagTQQK4GIgQQ/mbLhL1cxGJtn9n8=";
|
||||
|
||||
cargoTestFlags = [
|
||||
"--package viceroy-lib"
|
||||
|
||||
Reference in New Issue
Block a user