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

Merge master into staging-next

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2025-04-10 18:05:07 +00:00
committed by GitHub
parent dc1cabcadd 4a0b66d1f5
commit 4be6101620
16 changed files with 98 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maintainers/scripts/luarocks-packages.csv
+1
View File
@@ -26,6 +26,7 @@ funnyfiles.nvim,,,,,,mrcjkb
fzf-lua,,,,,,mrcjkb
fzy,,,,,,mrcjkb
gitsigns.nvim,https://raw.githubusercontent.com/lewis6991/gitsigns.nvim/main/gitsigns.nvim-scm-1.rockspec,,,,5.1,
grug-far.nvim,,,,,,teto
haskell-tools.nvim,,,,,,mrcjkb
http,,,,0.3-0,,vcunat
image.nvim,,,,,,teto
1 name rockspec ref server version luaversion maintainers
26 fzf-lua mrcjkb
27 fzy mrcjkb
28 gitsigns.nvim https://raw.githubusercontent.com/lewis6991/gitsigns.nvim/main/gitsigns.nvim-scm-1.rockspec 5.1
29 grug-far.nvim teto
30 haskell-tools.nvim mrcjkb
31 http 0.3-0 vcunat
32 image.nvim teto
pkgs/applications/editors/vim/plugins/generated.nix
-13
View File
@@ -5438,19 +5438,6 @@ final: prev: {
meta.hydraPlatforms = [ ];
};
grug-far-nvim = buildVimPlugin {
pname = "grug-far.nvim";
version = "2025-04-08";
src = fetchFromGitHub {
owner = "MagicDuck";
repo = "grug-far.nvim";
rev = "082f97122dd59d816a9a7b676d2b2f86a8ab6ed9";
sha256 = "04z8d5vh4z26d3rpf8ab78q434zsvg6h1fb7hhkd3mqk8wlv0zyw";
};
meta.homepage = "https://github.com/MagicDuck/grug-far.nvim/";
meta.hydraPlatforms = [ ];
};
gruvbox = buildVimPlugin {
pname = "gruvbox";
version = "2023-08-14";
pkgs/applications/editors/vim/plugins/luaPackagePlugins.nix
+1
View File
@@ -10,6 +10,7 @@ let
luarocksPackageNames = [
"fidget-nvim"
"gitsigns-nvim"
"grug-far-nvim"
"image-nvim"
"lsp-progress-nvim"
"lualine-nvim"
pkgs/applications/editors/vim/plugins/vim-plugin-names
-1
View File
@@ -416,7 +416,6 @@ https://github.com/brymer-meneses/grammar-guard.nvim/,HEAD,
https://github.com/liuchengxu/graphviz.vim/,,
https://github.com/cbochs/grapple.nvim/,HEAD,
https://github.com/blazkowolf/gruber-darker.nvim/,,
https://github.com/MagicDuck/grug-far.nvim/,,
https://github.com/morhetz/gruvbox/,,
https://github.com/luisiacc/gruvbox-baby/,HEAD,
https://github.com/gruvbox-community/gruvbox/,,gruvbox-community
pkgs/applications/science/astronomy/stellarium/default.nix
+17 -18
View File
@@ -2,7 +2,6 @@
lib,
stdenv,
fetchFromGitHub,
fetchpatch,
cmake,
perl,
wrapGAppsHook3,
@@ -24,34 +23,33 @@
testers,
xvfb-run,
gitUpdater,
md4c,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "stellarium";
version = "24.4";
version = "25.1";
src = fetchFromGitHub {
owner = "Stellarium";
repo = "stellarium";
rev = "v${finalAttrs.version}";
hash = "sha256-/xF9hXlPKhmpvpx9t1IgSqpvvqrGnd0xaf0QMvu+9IA=";
hash = "sha256-rbnGSdzPuFdSqWPaKtF3n4oLZ9l+4jX7KtnmcrTvwbs=";
};
patches = [
# Fix indi headers from https://github.com/Stellarium/stellarium/pull/4025
(fetchpatch {
url = "https://github.com/Stellarium/stellarium/commit/9669d64fb4104830412c6c6c2b45811075a92300.patch";
hash = "sha256-CXeghxxRIV7Filveg+3pNAWymUpUuGnylvt4e8THJ8A=";
})
];
postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
substituteInPlace CMakeLists.txt \
--replace 'SET(CMAKE_INSTALL_PREFIX "''${PROJECT_BINARY_DIR}/Stellarium.app/Contents")' \
'SET(CMAKE_INSTALL_PREFIX "${placeholder "out"}/Applications/Stellarium.app/Contents")'
substituteInPlace src/CMakeLists.txt \
--replace "\''${_qt_bin_dir}/../" "${qtmultimedia}/lib/qt-6/"
'';
postPatch =
''
substituteInPlace CMakeLists.txt \
--replace-fail 'CPMAddPackage(NAME md4c' \
'CPMFindPackage(NAME md4c'
''
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
substituteInPlace CMakeLists.txt \
--replace-fail 'SET(CMAKE_INSTALL_PREFIX "''${PROJECT_BINARY_DIR}/Stellarium.app/Contents")' \
'SET(CMAKE_INSTALL_PREFIX "${placeholder "out"}/Applications/Stellarium.app/Contents")'
substituteInPlace src/CMakeLists.txt \
--replace-fail "\''${_qt_bin_dir}/../" "${qtmultimedia}/lib/qt-6/"
'';
nativeBuildInputs = [
cmake
@@ -74,6 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
indilib
libnova
exiv2
md4c
nlopt
]
++ lib.optionals stdenv.hostPlatform.isLinux [
pkgs/applications/terminal-emulators/rxvt-unicode/default.nix
+1
View File
@@ -164,5 +164,6 @@ stdenv.mkDerivation {
maintainers = with maintainers; [ rnhmjoj ];
platforms = platforms.unix;
license = licenses.gpl3;
mainProgram = "urxvt";
};
}
pkgs/by-name/ch/checkstyle/package.nix
+2 -2
View File
@@ -7,12 +7,12 @@
}:
stdenvNoCC.mkDerivation rec {
version = "10.22.0";
version = "10.23.0";
pname = "checkstyle";
src = fetchurl {
url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar";
sha256 = "sha256-U6QpASgCKxv3NTFINkJ9Aey4E9Y089RY5X2TNhSlIOs=";
sha256 = "sha256-4KMZ2WNntgMEjoOSECPko6zi89Zesb/t6oM+uZEKEDc=";
};
nativeBuildInputs = [ makeBinaryWrapper ];
pkgs/by-name/ic/icestudio/package.nix
+7 -5
View File
@@ -5,6 +5,7 @@
buildNpmPackage,
makeDesktopItem,
makeWrapper,
unstableGitUpdater,
nwjs,
python3,
@@ -12,13 +13,13 @@
let
# Use unstable because it has improvements for finding python
version = "0-unstable-2024-11-18";
version = "0.12-unstable-2025-03-08";
src = fetchFromGitHub {
owner = "FPGAwars";
repo = "icestudio";
rev = "87d057adb1e795352a7dd67666a69ada4269b2e8";
hash = "sha256-VZuc5Wa6o5PMUE+P4EMDl/pI/zmcff9OEhqeCfS4bzE=";
rev = "46d39da2613aa2f55a068b50e7ac45a8f270005d";
hash = "sha256-UNRNJubM9ePjXhqZ9RiZQIxGBMM3nOye83S7J8wCHMg=";
};
collection = fetchurl {
@@ -29,7 +30,7 @@ let
app = buildNpmPackage {
pname = "icestudio-app";
inherit version src;
npmDepsHash = "sha256-CbrnhnhCG8AdAqySO6fB5hZ128lHyC3WH/vZcFtv6Ko=";
npmDepsHash = "sha256-Dpnx23iq0fK191DXFgIfnbi+MLEp65H6eL81Icg4H4U=";
sourceRoot = "${src.name}/app";
dontNpmBuild = true;
installPhase = ''
@@ -50,7 +51,7 @@ in
buildNpmPackage rec {
pname = "icestudio";
inherit version src;
npmDepsHash = "sha256-y1lo5+qJ6JBxjt7wtUmTHuJHMH9Mztf6xmmadI8zBgA=";
npmDepsHash = "sha256-ZHvXC0hpAcPMsHhxQWELFC2b+WBNoEvbtLLNJsDhMso=";
npmFlags = [
# Use the legacy dependency resolution, with less strict version
# requirements for transative dependencies
@@ -101,6 +102,7 @@ buildNpmPackage rec {
runHook postInstall
'';
passthru.updateScript = unstableGitUpdater { };
nativeBuildInputs = [ makeWrapper ];
pkgs/by-name/mi/miracle-wm/package.nix
+2 -2
View File
@@ -30,13 +30,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "miracle-wm";
version = "0.5.1";
version = "0.5.2";
src = fetchFromGitHub {
owner = "miracle-wm-org";
repo = "miracle-wm";
tag = "v${finalAttrs.version}";
hash = "sha256-PCY6vAnDjyoIL66oREUGRypQFX90EKB1RlXTkQDyXMw=";
hash = "sha256-nmDFmj3DawgjRB0+vlcvPX+kj6lzAu14HySFc2NsJss=";
};
postPatch =
pkgs/by-name/mo/morphosis/package.nix
+3 -3
View File
@@ -20,15 +20,15 @@
python3Packages.buildPythonApplication rec {
pname = "morphosis";
version = "1.4.1";
version = "48.1";
pyproject = false;
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "World";
repo = "morphosis";
rev = "refs/tags/v${version}";
hash = "sha256-ZpxenBqC5qr7yNwjld0u7gSBQfL7Kpa4FWE9gkzG0hg=";
tag = version;
hash = "sha256-8Z1c0TtMAOPxzaFhEHDURTk2islHky8B/EIAdmj5hE0=";
};
strictDeps = true;
pkgs/by-name/op/openvino/package.nix
+2 -2
View File
@@ -61,14 +61,14 @@ in
stdenv.mkDerivation rec {
pname = "openvino";
version = "2025.0.0";
version = "2025.1.0";
src = fetchFromGitHub {
owner = "openvinotoolkit";
repo = "openvino";
tag = version;
fetchSubmodules = true;
hash = "sha256-+LXOX5ChfVbD2dbQYuIp9unz6v3OIpH5YUpdhn2okbM=";
hash = "sha256-KufQjBSzhj1N+T95PjlNU3Tc9V5/X2OLwCbXoI2fdZk=";
};
outputs = [
pkgs/by-name/si/sile/package.nix
+3 -3
View File
@@ -29,18 +29,18 @@
stdenv.mkDerivation (finalAttrs: {
pname = "sile";
version = "0.15.10";
version = "0.15.11";
src = fetchurl {
url = "https://github.com/sile-typesetter/sile/releases/download/v${finalAttrs.version}/sile-${finalAttrs.version}.tar.zst";
hash = "sha256-sPABtKfIpamGNWELnCnkVagHeuHq/1KoT364/aLHDu0=";
hash = "sha256-J+S2jT8/1bX35E3FyLLvPnSGY4hT2P7Uqu59L95cI0I=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) pname version src;
dontConfigure = true;
nativeBuildInputs = [ zstd ];
hash = "sha256-57NcGm46aggPO+/54P1arCSPV3BHlAWwmWIzbpkT2js=";
hash = "sha256-4hw2A9GYqNeNjEZRL7THKMoEBBmTnjKE00yQYLTW6zc=";
};
nativeBuildInputs = [
pkgs/by-name/te/textpieces/package.nix
+5 -5
View File
@@ -20,18 +20,18 @@
stdenv.mkDerivation (finalAttrs: {
pname = "textpieces";
version = "4.1.1-1";
version = "4.2.0";
src = fetchFromGitLab {
owner = "liferooter";
repo = "textpieces";
rev = "v${finalAttrs.version}";
hash = "sha256-+CmlJrND61w1qXSUgIsacBoJcmmf9eLI2GSvDJbXv44=";
tag = "v${finalAttrs.version}";
hash = "sha256-JFHDPzVRD3HZI9+TBCe92xTcuIPAF/iD8hIiYPgetLc=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) src;
hash = "sha256-fpnXMzQFne/TnRgjWy47nVlcwXFZJG4S+VD+D6bz5iQ=";
inherit (finalAttrs) pname version src;
hash = "sha256-SMNyPo0y8376wjuZVyu3jMjfPgddEMrqCPvUzsYa0xc=";
};
nativeBuildInputs = [
pkgs/by-name/tu/turbo-unwrapped/package.nix
+3 -3
View File
@@ -17,17 +17,17 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "turbo-unwrapped";
version = "2.4.5-canary.4";
version = "2.5.0";
src = fetchFromGitHub {
owner = "vercel";
repo = "turborepo";
tag = "v${finalAttrs.version}";
hash = "sha256-tQ/Xocpk48eRhCyfRZx2rkAVqNn115rO3MRYF5fC2nI=";
hash = "sha256-crpEJdhO27cVXl4YnPmUwvJFAeezcxdS/vJPJ2m1VU8=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-pngzlmkntTCv5/aw1UNbDGNQOVtMgFZHc2woj6R0vys=";
cargoHash = "sha256-7pcJ7NUTLe9rxLWnviJbWtTg1P145BzL1ZfWcuxPlSc=";
nativeBuildInputs =
[
pkgs/development/lua-modules/generated-packages.nix
+30
View File
@@ -926,6 +926,36 @@ final: prev: {
}
) { };
grug-far-nvim = callPackage (
{
buildLuarocksPackage,
fetchurl,
fetchzip,
luaOlder,
}:
buildLuarocksPackage {
pname = "grug-far.nvim";
version = "1.5.15-1";
knownRockspec =
(fetchurl {
url = "mirror://luarocks/grug-far.nvim-1.5.15-1.rockspec";
sha256 = "1jp6b6kqp389wli766rypam4hr6dqv6v5r8kv1dk21d7glz8hg6h";
}).outPath;
src = fetchzip {
url = "https://github.com/MagicDuck/grug-far.nvim/archive/5da116bc99a03e14be3b824e319f4e49c676af78.zip";
sha256 = "196l6vy9573fkwld3cl927706a6gfgmc71kn1kx3pmk8l6p8hcya";
};
disabled = luaOlder "5.1";
meta = {
homepage = "https://github.com/MagicDuck/grug-far.nvim";
description = "Find And Replace plugin for neovim";
license.fullName = "MIT";
};
}
) { };
http = callPackage (
{
basexx,
pkgs/development/lua-modules/overrides.nix
+21
View File
@@ -212,6 +212,27 @@ in
'';
});
grug-far-nvim = prev.grug-far-nvim.overrideAttrs ({
doCheck = lua.luaversion == "5.1" && !stdenv.hostPlatform.isDarwin;
nativeCheckInputs = [
final.busted
final.mini-test
final.nlua
ripgrep
neovim-unwrapped
];
# feel free to disable the checks. They are mostly screenshot based
checkPhase = ''
runHook preCheck
# feel free to disable/adjust the tests
rm tests/base/test_apply.lua tests/base/test_vimscript_interpreter.lua
make test dir=base
runHook postCheck
'';
});
http = prev.http.overrideAttrs (oa: {
patches = [
(fetchpatch {