Merge master into staging-next

This commit is contained in:
nixpkgs-ci[bot]
2025-12-30 18:06:06 +00:00
committed by GitHub
8 changed files with 25 additions and 28 deletions
@@ -12,13 +12,13 @@
inherit hamlibSupport gpsdSupport extraScripts;
}).overrideAttrs
(oldAttrs: {
version = "1.8.1-unstable-2025-12-19";
version = "1.8.1-unstable-2025-12-28";
src = fetchFromGitHub {
owner = "wb2osz";
repo = "direwolf";
rev = "1924999dbd24ce155aff69fec76cee35ad478bdd";
hash = "sha256-Q9mYeDQHaMNez1oQHaQTfjU/AxAKhpB98UcmaNujMjA=";
rev = "01c31145716fd57e2e53844718bdc769dcce16dd";
hash = "sha256-OxNhSrxshbdCCNkwnYzz/1NNYwNJYAQiQ7iaXw3x7kc=";
};
# drop upstreamed cmake-4 patch
+3 -3
View File
@@ -12,13 +12,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "etherpad-lite";
version = "2.5.1";
version = "2.5.3";
src = fetchFromGitHub {
owner = "ether";
repo = "etherpad-lite";
tag = "v${finalAttrs.version}";
hash = "sha256-0Qrmpz9ehblS2Jdw137CJVKYmhkXt8c9B6kDG8OxZPo=";
hash = "sha256-S8sPS0agLXih39+v7ZXk/khxrjJfoq50j3eXSGa8FQU=";
};
patches = [
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
inherit (finalAttrs) pname version src;
pnpm = pnpm_9;
fetcherVersion = 1;
hash = "sha256-gajm1yXQPZZ/oB27HwgTEoKLzwMKsHDoo2w+mIOnJrc=";
hash = "sha256-57LIfY1qH6/y11FB22lThCPUpsyr8YxgX7uNLP1jzAQ=";
};
nativeBuildInputs = [
+3 -3
View File
@@ -10,16 +10,16 @@
buildGoModule rec {
pname = "gocatcli";
version = "1.1.2";
version = "1.2.0";
src = fetchFromGitHub {
owner = "deadc0de6";
repo = "gocatcli";
tag = "v${version}";
hash = "sha256-kNXuQlBLiDEbKwtSmdX4XPLyMZFyBvLKEmQdCDug4ao=";
hash = "sha256-a76vQGfw5LnLVurPkAXdwVtdCn+hjmC5Q5oNYSHRsjo=";
};
vendorHash = "sha256-gi4/ekLGh5T5D3ifW/FF+ewHesWOyhY01ZZIG6+OENo=";
vendorHash = "sha256-aT56Xx6m/AlvzPmlaJR4wiqTsxjWk0lyPXShNaHPoaU=";
nativeBuildInputs = [ installShellFiles ];
+2 -2
View File
@@ -11,14 +11,14 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "iaito";
version = "6.0.4";
version = "6.0.7";
srcs = [
(fetchFromGitHub {
owner = "radareorg";
repo = "iaito";
tag = finalAttrs.version;
hash = "sha256-99SuUTwHcpyJ5V9Cnanm6ylH3NVgyk3TmDoaFVwFE4E=";
hash = "sha256-sATBtjNboSnk3j1PVm60HZO1MDw1A4FRttVp0M4t+/I=";
name = "main";
})
(fetchFromGitHub {
+7 -10
View File
@@ -1,7 +1,7 @@
{
lib,
stdenv,
fetchsvn,
fetchgit,
ant,
jdk,
jre,
@@ -14,14 +14,11 @@ stdenv.mkDerivation (finalAttrs: {
pname = "jedit";
version = "5.7.0";
src =
let
versionWithDashes = lib.replaceStrings [ "." ] [ "-" ] finalAttrs.version;
in
fetchsvn {
url = "https://svn.code.sf.net/p/jedit/svn/jEdit/tags/jedit-${versionWithDashes}";
hash = "sha256-XfYK2C0QZrg4b//1eQcUNViRthBbXV+cbcYetzw2RG8=";
};
src = fetchgit {
url = "https://git.code.sf.net/p/jedit/jEdit";
tag = "v${finalAttrs.version}";
hash = "sha256-Q2uarFMWXTWuJ0brw1PNS/vKWUa9gOTpD6Fumn0wMoI=";
};
ivyDeps = stdenv.mkDerivation {
name = "${finalAttrs.pname}-${finalAttrs.version}-ivy-deps";
@@ -107,7 +104,7 @@ stdenv.mkDerivation (finalAttrs: {
'';
meta = {
changelog = "${finalAttrs.src.url}/doc/CHANGES.txt";
changelog = "https://sourceforge.net/p/jedit/jEdit/ci/v${finalAttrs.version}/tree/doc/CHANGES.txt";
description = "Programmer's text editor written in Java";
homepage = "https://www.jedit.org";
license = lib.licenses.gpl2Only;
+2 -2
View File
@@ -6,14 +6,14 @@
python3Packages.buildPythonApplication rec {
pname = "mnamer";
version = "2.5.5";
version = "2.6.0";
format = "pyproject";
src = fetchFromGitHub {
owner = "jkwill87";
repo = "mnamer";
tag = version;
sha256 = "sha256-qQu5V1GOsbrR00HOrot6TTAkc3KRasBPDEU7ZojUBio=";
sha256 = "sha256-lu1DWbR7LkaRddeAAHBWM61cnEZG4KVZdQWWRsbghb8=";
};
build-system = with python3Packages; [
+2 -2
View File
@@ -12,14 +12,14 @@
}:
python3Packages.buildPythonApplication rec {
pname = "monophony";
version = "4.2.1";
version = "4.3.0";
pyproject = true;
src = fetchFromGitLab {
owner = "zehkira";
repo = "monophony";
tag = "v${version}";
hash = "sha256-3RuAFg+9Mi+tBuLmXyWlFFNOfrUvrkNvedo9Au3tMYU=";
hash = "sha256-w2ev/fpswaNcutxg2zMwrtFkulMbbG7BUm3L8qlnZKk=";
};
sourceRoot = "${src.name}/source";
+3 -3
View File
@@ -14,16 +14,16 @@ let
in
rustPlatform.buildRustPackage (finalAttrs: {
pname = "texlab";
version = "5.25.0";
version = "5.25.1";
src = fetchFromGitHub {
owner = "latex-lsp";
repo = "texlab";
tag = "v${finalAttrs.version}";
hash = "sha256-UI88DQjLRJRPgKX3A+PoLNzgm/9uJeNERTrzh5mnAEk=";
hash = "sha256-hd7fDnZqNEz4Ayop3uPqL4IU6xgGsTjMhGvgF+Trgcw=";
};
cargoHash = "sha256-xDLKuAfLyo3V++OKb+anw9oHxehwUxqfnDCuT2GSDWw=";
cargoHash = "sha256-4HFl6bPCHSUhHD5QB8sOK6irUaCAioZgKBm67REEYR8=";
outputs = [ "out" ] ++ lib.optional (!isCross) "man";