Merge master into staging-next
This commit is contained in:
@@ -306,6 +306,9 @@
|
||||
- `jellyfin` was updated to `10.11.x`, which includes heavy backend changes.
|
||||
Make sure to backup your data and configuration directories
|
||||
and read the [Jellyfin 10.11.0 release announcement](https://jellyfin.org/posts/jellyfin-release-10.11.0/).
|
||||
**Important:** make sure you're running Jellyfin version `10.10.7` before upgrading,
|
||||
and beware that the migration may take several hours depending on your library size and state.
|
||||
The process must not be interrupted.
|
||||
|
||||
- A new hardening flag, `glibcxxassertions` was made available, corresponding to the glibc `_GLIBCXX_ASSERTIONS` option.
|
||||
|
||||
|
||||
@@ -35,7 +35,6 @@ runTest (
|
||||
logLevel = "debug";
|
||||
};
|
||||
extraAppsEnable = true;
|
||||
extraApps.notify_push = config.services.nextcloud.package.packages.apps.notify_push;
|
||||
# This test also validates that we can use an "external" database
|
||||
database.createLocally = false;
|
||||
config = {
|
||||
|
||||
@@ -39,7 +39,7 @@ runTest (
|
||||
};
|
||||
extraAppsEnable = true;
|
||||
extraApps = with config.services.nextcloud.package.packages.apps; {
|
||||
inherit notify_push notes;
|
||||
inherit notes;
|
||||
};
|
||||
settings.trusted_proxies = [ "::1" ];
|
||||
};
|
||||
|
||||
@@ -0,0 +1,23 @@
|
||||
{
|
||||
lib,
|
||||
vscode-utils,
|
||||
}:
|
||||
|
||||
vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "vscode-augment";
|
||||
publisher = "augment";
|
||||
version = "0.603.0";
|
||||
hash = "sha256-1CBZnBTu03iubIcIrUvCKeN6RtjKO3NUEXggdXTAwM8=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/augment.vscode-augment/changelog";
|
||||
description = "AI-powered coding assistant for VSCode";
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=augment.vscode-augment";
|
||||
homepage = "https://augmentcode.com/";
|
||||
license = lib.licenses.unfree;
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
|
||||
maintainers = [ lib.maintainers.matteopacini ];
|
||||
};
|
||||
}
|
||||
@@ -443,6 +443,8 @@ let
|
||||
};
|
||||
};
|
||||
|
||||
augment.vscode-augment = callPackage ./augment.vscode-augment { };
|
||||
|
||||
azdavis.millet = callPackage ./azdavis.millet { };
|
||||
|
||||
b4dm4n.vscode-nixpkgs-fmt = callPackage ./b4dm4n.vscode-nixpkgs-fmt { };
|
||||
@@ -4512,8 +4514,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "tabnine-vscode";
|
||||
publisher = "tabnine";
|
||||
version = "3.320.0";
|
||||
hash = "sha256-CFkLAMSMWGSHQwD0diSTn3z+U95Y4uCSnHNMTOj+iAo=";
|
||||
version = "3.320.4";
|
||||
hash = "sha256-ZuJX2ybmBDya0eCvIYx90JcGweHLiWanr72xItQpSXY=";
|
||||
};
|
||||
meta = {
|
||||
license = lib.licenses.mit;
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "dosbox-pure";
|
||||
version = "0-unstable-2025-10-18";
|
||||
version = "0-unstable-2025-10-25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "schellingb";
|
||||
repo = "dosbox-pure";
|
||||
rev = "fe0bdab8a04eedb912634d89ad8137de75529cff";
|
||||
hash = "sha256-kF69s5rGp4XWtoaDWTu66VoUFjba0BFNBdKuA0OKkms=";
|
||||
rev = "11a9e9e451b5013c6a19d58b26bbc75316f4080d";
|
||||
hash = "sha256-+dD1JWYvD03pzW97PZbick3+GdriowrDCylww+YyBls=";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
@@ -99,13 +99,23 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "fix-build-poppler-25.06.0.patch";
|
||||
url = "https://gitlab.com/inkscape/inkscape/-/commit/97bd8f29a61e691ceea98ca2444b974cf4256ae0.patch";
|
||||
url = "https://gitlab.com/inkscape/inkscape/-/commit/40f5b15b7e29908b79c54e81db6f340936102e08.patch";
|
||||
hash = "sha256-bYRd/KUh/7qFb7x0EuUgQYA9P8abcTf5XS67gzaAiXA=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "fix-build-poppler-25.07.0.patch";
|
||||
url = "https://gitlab.com/inkscape/inkscape/-/commit/ce52c5f96106ae5747171663a46831f21aa52d95.patch";
|
||||
hash = "sha256-3Yj+neSRSSQPeeZkHJ0P6v3Sis/lg9xiygktI6Z+zDY=";
|
||||
url = "https://gitlab.com/inkscape/inkscape/-/commit/8ae83ca81bbaebcc0ff0abe82300d56d2c94e6f9.patch";
|
||||
hash = "sha256-s7UMnv1pAiQA/HL5CEdBwCn4v/tsphc0MSnBJAoqolY=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "fix-build-poppler-25.09.0.patch";
|
||||
url = "https://gitlab.com/inkscape/inkscape/-/commit/f48b429827dca510b41a5671d467e574ef348625.patch";
|
||||
hash = "sha256-9CfmkTGMVHjZiiE3zvi4YOrytcir8a7O2z3PrhjcohI=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "fix-build-poppler-25.10.0.patch";
|
||||
url = "https://gitlab.com/inkscape/inkscape/-/commit/4dba481fe898c6317696d50b109f5aed8f269c19.patch";
|
||||
hash = "sha256-FFCkMU+Ec2qobG4ru89NPcM9Gxw8ZyFV+6jpW8ZwgE4=";
|
||||
})
|
||||
];
|
||||
|
||||
|
||||
@@ -33,13 +33,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "organicmaps";
|
||||
version = "2025.10.07-1";
|
||||
version = "2025.10.23-22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "organicmaps";
|
||||
repo = "organicmaps";
|
||||
tag = "${finalAttrs.version}-android";
|
||||
hash = "sha256-132C3k8KvnQNC/AOoBlikl+AsRQdaaH00U3AFA4jo1Q=";
|
||||
hash = "sha256-4TSN4G5tUvtzSXASDfOE1xiitQx9wE2/ZydFwpov+UM=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -17,14 +17,14 @@
|
||||
|
||||
buildGoModule rec {
|
||||
inherit pname;
|
||||
version = "2.12.0";
|
||||
version = "2.12.1";
|
||||
tags = lib.optionals enableGateway [ "gateway" ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kumahq";
|
||||
repo = "kuma";
|
||||
tag = version;
|
||||
hash = "sha256-5syQFcYBY/xKipIsAJdjVrXYXt7NNjjCeXiDVNO9NTo=";
|
||||
hash = "sha256-9s89fiBFIP6azB1SDCZkTlQWAQ2C6htQXRMvyWrNch0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-KgZYKopW+FOdwBIGxa2RLiEbefZ/1vAhcsWtcYhgdFs=";
|
||||
|
||||
@@ -314,6 +314,19 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# Revert part of https://github.com/LibreOffice/core/commit/6f60670877208612b5ea320b3677480ef6508abb that broke zlib linking
|
||||
./readd-explicit-zlib-link.patch
|
||||
|
||||
# Backport patch to fix build with Poppler 25.09
|
||||
(fetchpatch2 {
|
||||
url = "https://github.com/LibreOffice/core/commit/7848e02819c007026952a3fdc9da0961333dc079.patch";
|
||||
includes = [ "sdext/*" ];
|
||||
hash = "sha256-Nw6GFmkFy13w/ktCxw5s7SHL34auP1BQ9JvQnQ65aVU=";
|
||||
})
|
||||
]
|
||||
++ lib.optionals (lib.versionAtLeast version "25.8") [
|
||||
# Fix build with Poppler 25.10
|
||||
(fetchpatch2 {
|
||||
url = "https://gitlab.archlinux.org/archlinux/packaging/packages/libreoffice-fresh/-/raw/41e58e117c356af2be83993595caf61f9f30cc89/poppler-25.10.patch";
|
||||
hash = "sha256-KMsjDtRRH8Vy/FXaVwxUo0Ww10PCE0sK8+ZL0Ja2kJQ=";
|
||||
})
|
||||
]
|
||||
++ lib.optionals (variant == "collabora") [
|
||||
# Backport patch to fix build with Poppler 25.05
|
||||
@@ -322,6 +335,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
includes = [ "sdext/*" ];
|
||||
hash = "sha256-8yipl5ln1yCNfVM8SuWowsw1Iy/SXIwbdT1ZfNw4cJA=";
|
||||
})
|
||||
# Fix build with Poppler 25.10
|
||||
(fetchpatch2 {
|
||||
url = "https://gitlab.archlinux.org/archlinux/packaging/packages/libreoffice-still/-/raw/f5241554e4a0f6fd95ac4e5cc398a30243407e6a/fix_build_with_poppler_25.10.patch";
|
||||
hash = "sha256-lbPOkc1HeT5Qsp6XfVyVJtmvSL68qTrmbd3q9lvKSu8=";
|
||||
})
|
||||
]
|
||||
++ lib.optionals (variant == "collabora") [
|
||||
./fix-unpack-collabora.patch
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
config,
|
||||
docutils,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
ffmpeg,
|
||||
freefont_ttf,
|
||||
freetype,
|
||||
@@ -112,6 +113,16 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-x8cDczKIX4+KrvRxZ+72TGlEQHd4Kx7naq0CSoOZGHA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# ffmpeg-8 compat:
|
||||
# https://github.com/mpv-player/mpv/pull/16145
|
||||
(fetchpatch {
|
||||
name = "ffmpeg-8.patch";
|
||||
url = "https://github.com/mpv-player/mpv/commit/26b29fba02a2782f68e2906f837d21201fc6f1b9.patch";
|
||||
hash = "sha256-ANNoTtIJBARHbm5IgrE0eEZyzmNhOnbVgve7iqCBzQg=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = lib.concatStringsSep "\n" [
|
||||
# Don't reference compile time dependencies or create a build outputs cycle
|
||||
# between out and dev
|
||||
|
||||
@@ -42,9 +42,9 @@ let
|
||||
wayland
|
||||
];
|
||||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "alacritty";
|
||||
version = "0.15.1" + lib.optionalString withGraphics "-graphics";
|
||||
version = if !withGraphics then "0.16.1" else "0.16.0-graphics";
|
||||
|
||||
src =
|
||||
# by default we want the official package
|
||||
@@ -52,23 +52,23 @@ rustPlatform.buildRustPackage rec {
|
||||
fetchFromGitHub {
|
||||
owner = "alacritty";
|
||||
repo = "alacritty";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-/yERMNfCFLPb1S17Y9OacVH8UobDIIZDhM2qPzf5Vds=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-IOPhnJ76kZ2djJjxJEUwWPvHDeeXbJAn1ClipTH7nWs=";
|
||||
}
|
||||
# optionally we want to build the sixels feature fork
|
||||
else
|
||||
fetchFromGitHub {
|
||||
owner = "ayosec";
|
||||
repo = "alacritty";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-n8vO6Q4bzWLaOqg8YhZ+aLOtBBTQ9plKIEJHXq+hhnM=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-JbsHozYMh7hFMAsu823IcVZTzvMEGQP+oKpUnlmM7Nk=";
|
||||
};
|
||||
|
||||
cargoHash =
|
||||
if !withGraphics then
|
||||
"sha256-uXwefUV1NAKqwwPIWj4Slkx0c5b+RfLR3caTb42fc4M="
|
||||
"sha256-OBhrd4q44LCUGnjDEedhrOuoSC2UFR90IKSQfEPY/Q4="
|
||||
else
|
||||
"sha256-UtxZFqU974N+YcHoEHifBjNSyaVuMvuc1clTDgUPuoQ=";
|
||||
"sha256-fsTs37w4CvYvFN8ZgWxMA2hmgW0hJcIvhLiuhYxs4+Y=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
@@ -144,7 +144,11 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
meta = {
|
||||
description = "Cross-platform, GPU-accelerated terminal emulator";
|
||||
homepage = "https://github.com/alacritty/alacritty";
|
||||
homepage =
|
||||
if !withGraphics then
|
||||
"https://github.com/alacritty/alacritty"
|
||||
else
|
||||
"https://github.com/ayosec/alacritty";
|
||||
license = lib.licenses.asl20;
|
||||
mainProgram = "alacritty";
|
||||
maintainers = with lib.maintainers; [
|
||||
@@ -152,6 +156,10 @@ rustPlatform.buildRustPackage rec {
|
||||
rvdp
|
||||
];
|
||||
platforms = lib.platforms.unix;
|
||||
changelog = "https://github.com/alacritty/alacritty/blob/v${version}/CHANGELOG.md";
|
||||
changelog =
|
||||
if !withGraphics then
|
||||
"https://github.com/alacritty/alacritty/blob/v${finalAttrs.version}/CHANGELOG.md"
|
||||
else
|
||||
"https://github.com/ayosec/alacritty/blob/v${finalAttrs.version}/CHANGELOG.md";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -6,12 +6,12 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "alibuild";
|
||||
version = "1.17.30";
|
||||
version = "1.17.31";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-gLJQnQgFrB/4YTB8rpYicC97avuw0EhO4hUaxYYwvbE=";
|
||||
hash = "sha256-agAWJaaaHGN2oQaaIkMNEeU712bkWXEPH3jP8oH5Qjs=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [
|
||||
|
||||
@@ -12,11 +12,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "avro-c";
|
||||
version = "1.12.0";
|
||||
version = "1.12.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/avro/avro-${version}/c/avro-c-${version}.tar.gz";
|
||||
sha256 = "sha256-dDM9QxB5w113DO9plstN4EBY0Z6BvQuaNjvP04V1A38=";
|
||||
sha256 = "sha256-tk4xuUcZSZVJYiqpLx2W0XQpZ87SYaCTG2O+O76Qfyw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -11,11 +11,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "bevelbar";
|
||||
version = "24.07";
|
||||
version = "25.08";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.uninformativ.de/git/bevelbar/archives/bevelbar-v${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-PUYgbJCII0JecetoY3dMBUgrtaVhlLKeaJY27JJ78RQ=";
|
||||
hash = "sha256-XGnvpPNonMVCaMgSqJIiklBMLam/k4XLHUrgnhxoxNI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@@ -12,6 +12,7 @@
|
||||
util-linux,
|
||||
enableSnapper ? true,
|
||||
nix-update-script,
|
||||
fetchpatch,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@@ -25,6 +26,15 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-hFWYT+YIgnqBigpPkGdsLj6rcg4CjJffAyXlR23QP0Y=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Disable -Werror
|
||||
# https://gitlab.com/btrfs-assistant/btrfs-assistant/-/issues/134
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.com/btrfs-assistant/btrfs-assistant/-/commit/edc0a13bac5189a1a910f5adab01b2d5b60c76f6.diff";
|
||||
hash = "sha256-kGyp5OaSGk4OvhtyNSygJEW+wAJksK8opxtLPbhA+10=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
git
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
pkg-config,
|
||||
qt6,
|
||||
perl,
|
||||
fetchpatch2,
|
||||
|
||||
# Cantata doesn't build with cdparanoia enabled so we disable that
|
||||
# default for now until I (or someone else) figure it out.
|
||||
@@ -176,6 +177,18 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# patchShebangs the playlists scripts, making that unnecessary (perl will
|
||||
# always be available because it's a dependency)
|
||||
./dont-check-for-perl-in-PATH.diff
|
||||
|
||||
# remove following patches in next release
|
||||
(fetchpatch2 {
|
||||
name = "fix-build-with-qt-610-qfile-open.patch";
|
||||
url = "https://github.com/nullobsi/cantata/pull/89.patch";
|
||||
hash = "sha256-c7hdecX2oo9jTlLc6zd7LVjgZj4w89zN+eEw7ol/hmI=";
|
||||
})
|
||||
(fetchpatch2 {
|
||||
name = "fix-build-with-qt-610-invalidateFilter-deprecated.patch";
|
||||
url = "https://github.com/nullobsi/cantata/pull/90.patch";
|
||||
hash = "sha256-dMxbC/p5mD/TQZEXORbvNON7Zzbvq0khaIR89lU5cO4=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -6,46 +6,40 @@
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cargo-hakari";
|
||||
version = "0.9.35";
|
||||
version = "0.9.36";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "guppy-rs";
|
||||
repo = "guppy";
|
||||
tag = "cargo-hakari-${version}";
|
||||
hash = "sha256-+IjtK4kSm2vThgIxDsBLpoh0j9cDhhEqI6Hr2BmC7hc=";
|
||||
tag = "cargo-hakari-${finalAttrs.version}";
|
||||
hash = "sha256-qEYdJhLt4f3+RZz3/T6/vlQgrQYK6S5dNEmu8QH/wj0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-yAk0hMB3OEaaIuNqiJtl1K5P19pOGtiyt4cvU+Nb814=";
|
||||
cargoHash = "sha256-NrPfdVAi0QblJKFsHTL0BGQWUnqQEpIJwW3HBVHFZpE=";
|
||||
|
||||
cargoBuildFlags = [
|
||||
"-p"
|
||||
"cargo-hakari"
|
||||
];
|
||||
cargoTestFlags = [
|
||||
"-p"
|
||||
"cargo-hakari"
|
||||
];
|
||||
cargoTestFlags = finalAttrs.cargoBuildFlags;
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
doInstallCheck = true;
|
||||
versionCheckProgramArg = "--version";
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Manage workspace-hack packages to speed up builds in large workspaces";
|
||||
mainProgram = "cargo-hakari";
|
||||
longDescription = ''
|
||||
cargo hakari is a command-line application to manage workspace-hack crates.
|
||||
Use it to speed up local cargo build and cargo check commands by 15-95%,
|
||||
and cumulatively by 20-25% or more.
|
||||
'';
|
||||
homepage = "https://crates.io/crates/cargo-hakari";
|
||||
changelog = "https://github.com/guppy-rs/guppy/blob/cargo-hakari-${version}/tools/cargo-hakari/CHANGELOG.md";
|
||||
changelog = "https://github.com/guppy-rs/guppy/blob/cargo-hakari-${finalAttrs.version}/tools/cargo-hakari/CHANGELOG.md";
|
||||
license = with lib.licenses; [
|
||||
mit
|
||||
asl20
|
||||
@@ -55,5 +49,6 @@ rustPlatform.buildRustPackage rec {
|
||||
macalinao
|
||||
nartsiss
|
||||
];
|
||||
mainProgram = "cargo-hakari";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -29,11 +29,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "clightning";
|
||||
version = "25.09";
|
||||
version = "25.09.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip";
|
||||
hash = "sha256-qX9EZHuDtEcYCU8YOMbHTo3JDAAJ8nc6N7F/+AAEpn4=";
|
||||
hash = "sha256-maH+SSMunXH43Hl9FFvk5L6n4e06vgsL3T8W3ydy+hQ=";
|
||||
};
|
||||
|
||||
# when building on darwin we need cctools to provide the correct libtool
|
||||
|
||||
@@ -6,11 +6,11 @@
|
||||
|
||||
buildGraalvmNativeImage (finalAttrs: {
|
||||
pname = "clj-kondo";
|
||||
version = "2025.07.28";
|
||||
version = "2025.09.22";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/clj-kondo/clj-kondo/releases/download/v${finalAttrs.version}/clj-kondo-${finalAttrs.version}-standalone.jar";
|
||||
sha256 = "sha256-ioKRFkm+zBAAM7oyR4F6rTHEhViuRNuMXcr1xwnjcms=";
|
||||
sha256 = "sha256-TD7GlvYfGbFaM3qIEngIRbBVKEQ2g2sdAjE/oO1ZlHw=";
|
||||
};
|
||||
|
||||
extraNativeImageBuildArgs = [
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "crowdsec";
|
||||
version = "1.7.0";
|
||||
version = "1.7.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "crowdsecurity";
|
||||
repo = "crowdsec";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-ILGvHSDONyq6O1V/xm4lanSTmkdkMAwvvhoUtM2b7Gc=";
|
||||
hash = "sha256-f0SxOXxXqKft3Nnf9y7itpPXJOjBrEpImbPANFNx4BM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-B9VZlNks7/ozay5+di++sbLwIKN98P7U+o6knVaKlqo=";
|
||||
vendorHash = "sha256-v1UECFfgx1zFCzSyazxFRWMP/0fayVnrC+pJHio5z+Q=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "amazon-ecs-agent";
|
||||
version = "1.99.1";
|
||||
version = "1.100.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "aws";
|
||||
repo = "amazon-ecs-agent";
|
||||
hash = "sha256-aGmXu+ho5H6vPTBWR5OvqDcmFQN87BOl99HGIek24CE=";
|
||||
hash = "sha256-U5Rvo1m3JuJTF+gvkbgyS+PDouR3Z0WcO4YQ95GUTic=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -1,21 +1,21 @@
|
||||
{
|
||||
"version": "12.2.1",
|
||||
"version": "12.3.3",
|
||||
"sources": {
|
||||
"aarch64-linux": {
|
||||
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.2.1/floorp-linux-aarch64.tar.xz",
|
||||
"sha256": "bacc6f31dbda6a2bbb5e9b3541511750d835feb1b161092bd801b8c5feaae249"
|
||||
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.3.3/floorp-linux-aarch64.tar.xz",
|
||||
"sha256": "ad2a957493f2ad9aea294ca0322c6b744f6c1188fbefbd772c0a5c0e65832456"
|
||||
},
|
||||
"x86_64-linux": {
|
||||
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.2.1/floorp-linux-amd64.tar.xz",
|
||||
"sha256": "cac00263e6cea2a4490d597a6287a7902a72907ad0ed6676a959873104b049d2"
|
||||
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.3.3/floorp-linux-x86_64.tar.xz",
|
||||
"sha256": "9bcbfadbae583cdd8a45ab3735fa08e0f613151645fc8ae5ee716cbb6140b76c"
|
||||
},
|
||||
"aarch64-darwin": {
|
||||
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.2.1/floorp-macOS-universal.dmg",
|
||||
"sha256": "7b086811976c394767f9fcf4880d5a114b6d2e8d4f12703c1529fc61eb89eacd"
|
||||
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.3.3/floorp-macOS-universal.dmg",
|
||||
"sha256": "0f9c3d2efe228f63c8f7c95aae19eee137f2a4ddfa980cdedf0d1da4fc4a975c"
|
||||
},
|
||||
"x86_64-darwin": {
|
||||
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.2.1/floorp-macOS-universal.dmg",
|
||||
"sha256": "7b086811976c394767f9fcf4880d5a114b6d2e8d4f12703c1529fc61eb89eacd"
|
||||
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.3.3/floorp-macOS-universal.dmg",
|
||||
"sha256": "0f9c3d2efe228f63c8f7c95aae19eee137f2a4ddfa980cdedf0d1da4fc4a975c"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -31,7 +31,7 @@ jq '
|
||||
| map(
|
||||
if .url | contains("linux-aarch64") then
|
||||
{key: "aarch64-linux", value: .}
|
||||
elif .url | contains("linux-amd64") then
|
||||
elif .url | contains("linux-x86_64") then
|
||||
{key: "x86_64-linux", value: .}
|
||||
elif .url | contains("macOS-universal") then
|
||||
[{key: "aarch64-darwin", value: .}, {key: "x86_64-darwin", value: .}]
|
||||
|
||||
@@ -1,27 +1,36 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
python3Packages,
|
||||
fetchPypi,
|
||||
fetchFromGitHub,
|
||||
writableTmpDirAsHomeHook,
|
||||
gitMinimal,
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonPackage rec {
|
||||
pname = "gcovr";
|
||||
version = "8.3";
|
||||
version = "8.4";
|
||||
pyproject = true;
|
||||
|
||||
disabled = python3Packages.pythonOlder "3.9";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-+qNx+cSn94yYANplUQfU+Z8EtxjRwNn0jK/cvvAEkHk=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "gcovr";
|
||||
repo = "gcovr";
|
||||
tag = version;
|
||||
hash = "sha256-v3jNODYD9qa3mwttfuldhhIHrfR5LcsZ+WNWiOWb35E=";
|
||||
};
|
||||
|
||||
build-system = [ python3Packages.hatchling ];
|
||||
build-system = with python3Packages; [
|
||||
hatchling
|
||||
hatch-fancy-pypi-readme
|
||||
hatch-vcs
|
||||
];
|
||||
|
||||
# pythonRelaxDeps do not work on pyproject.toml
|
||||
preBuild = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail "hatchling==1.26.1" "hatchling"
|
||||
--replace-fail "hatchling==1.26.3" "hatchling"
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail "hatch-fancy-pypi-readme==24.1.0" "hatch-fancy-pypi-readme>=24.1.0"
|
||||
substituteInPlace pyproject.toml \
|
||||
@@ -36,23 +45,40 @@ python3Packages.buildPythonPackage rec {
|
||||
jinja2
|
||||
lxml
|
||||
pygments
|
||||
hatch-fancy-pypi-readme
|
||||
hatch-vcs
|
||||
]
|
||||
++ lib.optionals (pythonOlder "3.11") [ tomli ]
|
||||
);
|
||||
|
||||
# There are no unit tests in the pypi tarball. Most of the unit tests on the
|
||||
# github repository currently only work with gcc5, so we just disable them.
|
||||
# See also: https://github.com/gcovr/gcovr/issues/206
|
||||
# Despite the CI passing many GCC version, ~300 tests are failing on nixos
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"gcovr"
|
||||
"gcovr.configuration"
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
rm -rf src # this causes some pycache issues
|
||||
rm -rf admin/bump_version.py
|
||||
export CC_REFERENCE="gcc-${lib.versions.major stdenv.cc.version}"
|
||||
'';
|
||||
|
||||
nativeCheckInputs = with python3Packages; [
|
||||
writableTmpDirAsHomeHook
|
||||
pytestCheckHook
|
||||
pytest-timeout
|
||||
yaxmldiff
|
||||
nox
|
||||
requests
|
||||
gitMinimal
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# too fragile
|
||||
"test_build"
|
||||
"test_example"
|
||||
# assert 40 == 30 on log levels
|
||||
"test_multiple_output_formats_to_stdout"
|
||||
"test_multiple_output_formats_to_stdout_1"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Python script for summarizing gcov data";
|
||||
homepage = "https://www.gcovr.com/";
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
stdenv,
|
||||
callPackage,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
|
||||
useMinimalFeatures ? false,
|
||||
useArmadillo ? (!useMinimalFeatures),
|
||||
@@ -92,6 +93,14 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-CFQF3vDhhXsAnIfUcn6oTQ4Xm+GH/36dqSGc0HvyEJ0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "fix-build-poppler-25.10.0.patch";
|
||||
url = "https://github.com/OSGeo/gdal/commit/a716a6cd5ffd779b30950f046fce91878fc97b9d.patch";
|
||||
hash = "sha256-dSotpnTiMjt3Bz63hpNjF5juZ3JsjIpD59/67cR9rNU=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
bison
|
||||
cmake
|
||||
|
||||
@@ -56,24 +56,24 @@
|
||||
|
||||
let
|
||||
pname = "gitkraken";
|
||||
version = "11.5.0";
|
||||
version = "11.5.1";
|
||||
|
||||
throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}";
|
||||
|
||||
srcs = {
|
||||
x86_64-linux = fetchzip {
|
||||
url = "https://api.gitkraken.dev/releases/production/linux/x64/${version}/gitkraken-amd64.tar.gz";
|
||||
hash = "sha256-QNFNUVuslQ8ezDakqIPLMx6oSqS3K7VKu+Sm99d2d1E=";
|
||||
hash = "sha256-ctwkU8AWCuOKFetgCIPp6npk1ZO8ozfELrRp4PR3Xjs=";
|
||||
};
|
||||
|
||||
x86_64-darwin = fetchzip {
|
||||
url = "https://api.gitkraken.dev/releases/production/darwin/x64/${version}/GitKraken-v${version}.zip";
|
||||
hash = "sha256-NEy7hssChI3F62XQwHq3ENbTUrhXdtovCYxQQp4NLEU=";
|
||||
hash = "sha256-7wXpMwFGQeLgT7ObrZ5nUd84jzVArAIQ8vgp+fYDgsw=";
|
||||
};
|
||||
|
||||
aarch64-darwin = fetchzip {
|
||||
url = "https://api.gitkraken.dev/releases/production/darwin/arm64/${version}/GitKraken-v${version}.zip";
|
||||
hash = "sha256-ANHz+C5XMNEWy4x1btdg4XnhTOvWBVVoS/XpE5beW0w=";
|
||||
hash = "sha256-YkY6izRicIapNF9yMCL+YHJoxrWDdVwrcpj8N99tQCs=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "hasura";
|
||||
version = "2.48.5";
|
||||
version = "2.48.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hasura";
|
||||
repo = "graphql-engine";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-3mKwhRDmsI2fo5hd6DM3/+Nmf4eOswE2RUcOieOeSCE=";
|
||||
sha256 = "sha256-99HxAjqZQ4GtUR4F7EbVNKT7BI9AHm0uj54XgZZC2Lc=";
|
||||
};
|
||||
modRoot = "./cli";
|
||||
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "kaniko";
|
||||
version = "1.25.2";
|
||||
version = "1.25.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chainguard-dev";
|
||||
repo = "kaniko";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-4P/NKwC32/hW4goUelnx28zY9bBD5Hbbz/y+S00rt7k=";
|
||||
hash = "sha256-5KKRBAzyzmRbP/A5kOV6amUljLNCAmOMwp4jGg73fY8=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
fetchpatch2,
|
||||
cfitsio,
|
||||
cmake,
|
||||
curl,
|
||||
@@ -22,19 +23,29 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "kstars";
|
||||
version = "3.7.8";
|
||||
version = "3.7.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/stable/kstars/${finalAttrs.version}/kstars-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-VbOu8p7Bq6UJBr05PVZein4LWzpdLo4838G1jXGNLAw=";
|
||||
hash = "sha256-aE2gtAGzLBcUk+Heg+ZOMLd1wX6VEbrSpxkWETmlEZc=";
|
||||
};
|
||||
|
||||
# Qt 6.10 build patch from master
|
||||
# can be removed with next release
|
||||
patches = [
|
||||
(fetchpatch2 {
|
||||
url = "https://invent.kde.org/education/kstars/-/commit/ce53888e6dbaeb1b9239fca55288b5ead969b5a7.diff";
|
||||
hash = "sha256-awZeOLlG1vlCWC+QfypqHIIYexpywRmNT1ACdkqqLt4=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = with kdePackages; [
|
||||
extra-cmake-modules
|
||||
kdoctools
|
||||
wrapQtAppsHook
|
||||
cmake
|
||||
];
|
||||
|
||||
buildInputs = with kdePackages; [
|
||||
breeze-icons
|
||||
cfitsio
|
||||
@@ -70,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
cmakeFlags = with lib.strings; [
|
||||
(cmakeBool "BUILD_QT5" false)
|
||||
(cmakeBool "BUILD_WITH_QT6" true)
|
||||
(cmakeFeature "INDI_PREFIX" "${indi-full}")
|
||||
(cmakeFeature "XPLANET_PREFIX" "${xplanet}")
|
||||
(cmakeFeature "DATA_INSTALL_DIR" (placeholder "out") + "/share/kstars/")
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libhv";
|
||||
version = "1.3.3";
|
||||
version = "1.3.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ithewei";
|
||||
repo = "libhv";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-N2YD84eORA5nDpeeqy9jCvRx86PkRaKLzI6LF1AnHtU=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-YIWXdAZsWeSdtPtBaf/t9t68dFKw2nY0bvgMrzCEE5U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
@@ -26,19 +26,19 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DENABLE_UDS=ON"
|
||||
"-DWITH_MQTT=ON"
|
||||
"-DWITH_CURL=ON"
|
||||
"-DWITH_NGHTTP2=ON"
|
||||
"-DWITH_OPENSSL=ON"
|
||||
"-DWITH_KCP=ON"
|
||||
(lib.cmakeBool "ENABLE_UDS" true)
|
||||
(lib.cmakeBool "WITH_MQTT" true)
|
||||
(lib.cmakeBool "WITH_CURL" true)
|
||||
(lib.cmakeBool "WITH_NGHTTP2" true)
|
||||
(lib.cmakeBool "WITH_OPENSSL" true)
|
||||
(lib.cmakeBool "WITH_KCP" true)
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "C/c++ network library for developing TCP/UDP/SSL/HTTP/WebSocket/MQTT client/server";
|
||||
homepage = "https://github.com/ithewei/libhv";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ sikmir ];
|
||||
platforms = platforms.unix;
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ sikmir ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -83,6 +83,11 @@ stdenv.mkDerivation rec {
|
||||
+ lib.optionalString pythonSupport ''
|
||||
# Hardcode path to the shared library into the bindings.
|
||||
sed "s#@libiio@#$lib/lib/libiio${stdenv.hostPlatform.extensions.sharedLibrary}#g" ${./hardcode-library-path.patch} | patch -p1
|
||||
''
|
||||
+ lib.optionalString (pythonSupport && stdenv.hostPlatform.isDarwin) ''
|
||||
# Because we’re not building the framework, always use the dylib.
|
||||
substituteInPlace bindings/python/setup.py.cmakein \
|
||||
--replace-fail '"iio" if "Darwin" in _system() else' ""
|
||||
'';
|
||||
|
||||
postInstall = lib.optionalString pythonSupport ''
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
cmake,
|
||||
callPackage,
|
||||
|
||||
@@ -22,6 +23,14 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
sha256 = "sha256-YGtjoRBGOqkcHaiZNPVFOoeLitJTG/M0I08EPZVCfj0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "cmake-fix.patch";
|
||||
url = "https://github.com/aardappel/lobster/commit/a5f46ed65cad43ea70c8a6af5ea2fd5a018c8941.patch?full_index=1";
|
||||
hash = "sha256-91pmoTPLD2Fo2SuCKngdRxXFUty5lOyA4oX8zaJ0ON0=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [
|
||||
libGL
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "localstack";
|
||||
version = "4.9.1";
|
||||
version = "4.9.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "lora";
|
||||
version = "3.006";
|
||||
version = "3.021";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cyrealtype";
|
||||
repo = "lora";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-nNl2IC/KqYO6uS6ah0qWgesqm2cG8cIix/MhxbkOeAM=";
|
||||
hash = "sha256-v9wE9caI9HTCfO01Yf+s6KajF7WpnL12nu+IuOV7T+w=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
@@ -24,8 +24,9 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/share/fonts/truetype
|
||||
cp -R $src/fonts/ttf/*.ttf $out/share/fonts/truetype
|
||||
install -Dm444 -t $out/share/fonts/truetype $src/fonts/ttf/*.ttf
|
||||
install -Dm444 -t $out/share/fonts/opentype $src/fonts/otf/*.otf
|
||||
install -Dm444 -t $out/share/fonts/variable $src/fonts/variable/*.ttf
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "luau-lsp";
|
||||
version = "1.54.0";
|
||||
version = "1.55.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "JohnnyMorganz";
|
||||
repo = "luau-lsp";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-18r/NScWfSwAvFT46zdJsNYXoEW8FF34XyZajAaGb28=";
|
||||
hash = "sha256-ZrvPZi3ss83onsinyAl1AlQmV6jFctW8agYO9ieJtno=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -6,12 +6,12 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
version = "11.62";
|
||||
version = "11.65";
|
||||
pname = "monkeys-audio";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://monkeysaudio.com/files/MAC_${builtins.concatStringsSep "" (lib.strings.splitString "." finalAttrs.version)}_SDK.zip";
|
||||
hash = "sha256-qOzGOm5fzeV818Dv09A0+jieKRgvH3XbEGFmfsbtg3g=";
|
||||
hash = "sha256-XMvSab5ekbFyYptTqe0bfSkbptuTvbbRPc1r3IZL+Jk=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
|
||||
@@ -45,6 +45,11 @@ stdenv.mkDerivation rec {
|
||||
|
||||
propagatedBuildInputs = [ mpi ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 3.1)" "cmake_minimum_required(VERSION 3.10)"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Suite of MPI-based tools to manage large datasets";
|
||||
homepage = "https://hpc.github.io/mpifileutils";
|
||||
|
||||
@@ -76,6 +76,25 @@ buildPythonApplication rec {
|
||||
url = "https://github.com/mypaint/mypaint/commit/5496b1cd1113fcd46230d87760b7e6b51cc747bc.patch";
|
||||
hash = "sha256-h+sE1LW04xDU2rofH5KqXsY1M0jacfBNBC+Zb0i6y1w=";
|
||||
})
|
||||
# Format source so the later patches apply
|
||||
(fetchpatch {
|
||||
url = "https://github.com/mypaint/mypaint/commit/69d1d553034a31c0a466050a4acb323787dd04e6.patch";
|
||||
hash = "sha256-nziaPgfZRzPUvQEyQUM4FQbasHLFFT88H8qucbYI0pA=";
|
||||
includes = [
|
||||
"lib/strokemap.py"
|
||||
"lib/stroke.py"
|
||||
];
|
||||
})
|
||||
# Fix numpy deprecation
|
||||
(fetchpatch {
|
||||
url = "https://github.com/mypaint/mypaint/commit/2a92b6baf452aba2cff3cc0a7782b301da3933d7.patch";
|
||||
hash = "sha256-IkzdrA3pmeiihDOMzqIfc3uDd/wO3cI6dT+cVVhaQcI=";
|
||||
})
|
||||
# Fix numpy deprecation
|
||||
(fetchpatch {
|
||||
url = "https://github.com/mypaint/mypaint/commit/ab017e073e83a4930a0fb09608682bf4b7ab1874.patch";
|
||||
hash = "sha256-7OFqH75/gJYRJ1vROUDIkUqoBowAolBYQ5anWtp228o=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nix-plugins";
|
||||
version = "16.0.0";
|
||||
version = "16.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "shlevy";
|
||||
repo = "nix-plugins";
|
||||
rev = version;
|
||||
hash = "sha256-yofHs1IyAkyMqrWlLkmnX+CmH+qsvlhKN1YZM4nRf1M=";
|
||||
hash = "sha256-1P5oVXSx/hGK5MB2grxWtmqsKGtTEmT1XD5+NSsLFUw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "openlinkhub";
|
||||
version = "0.6.5";
|
||||
version = "0.6.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jurkovic-nikola";
|
||||
repo = "OpenLinkHub";
|
||||
tag = version;
|
||||
hash = "sha256-ouSk+yi5DEeZEUNQsy2UpRi80lxlXnRFyjeP+vd/Yl0=";
|
||||
hash = "sha256-WQKWuzf8iYD0DEivdFmiduwegOwLfYcKPPKxdMmn46E=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "partclone";
|
||||
version = "0.3.37";
|
||||
version = "0.3.38";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Thomas-Tsai";
|
||||
repo = "partclone";
|
||||
rev = version;
|
||||
sha256 = "sha256-VqPCj2DjWux17vgLb13AJd0EAHkqRGdIL0aPxkT3JlY=";
|
||||
sha256 = "sha256-lWnGi8giz7vzdBnuth55h0VMuNyCQaCclRqPJdm0I14=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "plasma-panel-spacer-extended";
|
||||
version = "1.11.1";
|
||||
version = "1.11.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "luisbocanegra";
|
||||
repo = "plasma-panel-spacer-extended";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-TQx9J10qfjCaolq/mpSjhV13uYxK/wBGIXH1sQFaLRA=";
|
||||
hash = "sha256-sSor6ZjYgjVzrC0leqpj+GZuj8ybpPb4lcBPhcXG+Nc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "plasmusic-toolbar";
|
||||
version = "3.6.0";
|
||||
version = "3.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ccatterina";
|
||||
repo = "plasmusic-toolbar";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Vs+aMTVaRaPuiFvLbW+BgOzdzPGYb3mEKdZqQyoSwC4=";
|
||||
hash = "sha256-yCsNvco01dy72f8g1+BCYXo1yx/ERdfggLYchj/UXcw=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "promptfoo";
|
||||
version = "0.118.11";
|
||||
version = "0.118.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "promptfoo";
|
||||
repo = "promptfoo";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-py85AvOnge5KAOwsCUVCgwVhbNMn6kqNpQ5w6KA60LM=";
|
||||
hash = "sha256-MyK533JOVCuO613XWFc2tHLdc4v4IEF8H1xCpS/XxUE=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-J/wVq10sgLFZiPuiXie3oi2I9uCycyRP/19AQdGLmF4=";
|
||||
npmDepsHash = "sha256-mpe00J5iRwaH7hJIDP3fDuJSUOKk01COpOOvF1YJMyg=";
|
||||
|
||||
# don't fetch playwright binary
|
||||
env.PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD = "1";
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
python3,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
gdk-pixbuf,
|
||||
adwaita-icon-theme,
|
||||
gpsbabel,
|
||||
@@ -41,6 +42,20 @@ python.pkgs.buildPythonApplication rec {
|
||||
hash = "sha256-t61vHVTKN5KsjrgbhzljB7UZdRask7qfYISd+++QbV0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix startup crash with SQLAlchemy 2.0
|
||||
(fetchpatch {
|
||||
url = "https://github.com/pytrainer/pytrainer/commit/9847c76e61945466775bde038057bf5fd31ae089.patch";
|
||||
hash = "sha256-cGNu4lK0eQWzcSFTKc8g/qHSSHfy0ow4T3eT+zl5lPM=";
|
||||
})
|
||||
|
||||
# Port to webkigtk 4.1
|
||||
(fetchpatch {
|
||||
url = "https://github.com/pytrainer/pytrainer/commit/eda968a8b48074f03efbdfbd692b46edef3658cd.patch";
|
||||
hash = "sha256-MdxsKO6DgncHhGlJWcEeyYiPKf3qdhMqXrYYC+jqros=";
|
||||
})
|
||||
];
|
||||
|
||||
build-system = with python3.pkgs; [ setuptools ];
|
||||
|
||||
dependencies = with python.pkgs; [
|
||||
@@ -89,10 +104,6 @@ python.pkgs.buildPythonApplication rec {
|
||||
postPatch = ''
|
||||
substituteInPlace pytrainer/platform.py \
|
||||
--replace-fail 'sys.prefix' "\"$out\""
|
||||
|
||||
# https://github.com/pytrainer/pytrainer/pull/281
|
||||
substituteInPlace pytrainer/extensions/mapviewer.py \
|
||||
--replace-fail "gi.require_version('WebKit2', '4.0')" "gi.require_version('WebKit2', '4.1')"
|
||||
'';
|
||||
|
||||
checkPhase = ''
|
||||
@@ -106,8 +117,6 @@ python.pkgs.buildPythonApplication rec {
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
# https://github.com/pytrainer/pytrainer/issues/280
|
||||
broken = true;
|
||||
homepage = "https://github.com/pytrainer/pytrainer";
|
||||
description = "Application for logging and graphing sporting excursions";
|
||||
mainProgram = "pytrainer";
|
||||
|
||||
@@ -27,6 +27,12 @@ stdenv.mkDerivation {
|
||||
libsForQt5.qtbase
|
||||
libsForQt5.qtx11extras
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace qScreenshot/{CMakeLists.txt,cmake/modules/version.cmake} \
|
||||
--replace-fail "cmake_minimum_required( VERSION 3.2.0 )" "cmake_minimum_required(VERSION 3.10)"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple creation and editing of screenshots";
|
||||
mainProgram = "qScreenshot";
|
||||
|
||||
@@ -26,15 +26,15 @@ let
|
||||
isQt6 = lib.versions.major qt6Packages.qtbase.version == "6";
|
||||
pdfjs =
|
||||
let
|
||||
version = "5.3.31";
|
||||
version = "5.4.296";
|
||||
in
|
||||
fetchzip {
|
||||
url = "https://github.com/mozilla/pdf.js/releases/download/v${version}/pdfjs-${version}-dist.zip";
|
||||
hash = "sha256-8QNFCIRSaF0y98P1mmx0u+Uf0/Zd7nYlFGXp9SkURTc=";
|
||||
hash = "sha256-UQ7sYOh7s95mfzH2ZbfDyEvUZiXr7MI3u0WY8WNHWv4=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
version = "3.5.1";
|
||||
version = "3.6.0";
|
||||
in
|
||||
|
||||
python3.pkgs.buildPythonApplication {
|
||||
@@ -44,7 +44,7 @@ python3.pkgs.buildPythonApplication {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/qutebrowser-${version}.tar.gz";
|
||||
hash = "sha256-gmu6MooINXJI1eWob6qwpzZVSXQ5rVTSaeISBVkms44=";
|
||||
hash = "sha256-XBtRjAiBvSMRFwdW1RZK2ZQnxwhzdjfK5O6SZrHUZ7w=";
|
||||
};
|
||||
|
||||
# Needs tox
|
||||
|
||||
@@ -13,14 +13,14 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "qxmpp";
|
||||
version = "1.11.2";
|
||||
version = "1.11.3";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "invent.kde.org";
|
||||
owner = "libraries";
|
||||
repo = "qxmpp";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-OR/rBp84pXv286Vd0I6IRzeUdC/+nnlRCZMAMXKgyxo=";
|
||||
hash = "sha256-93P4rKBSbs31uofl4AuVQQWVSRVOsKsykIG13p8zIkI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "readsb";
|
||||
version = "3.16.3";
|
||||
version = "3.16.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wiedehopf";
|
||||
repo = "readsb";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-IjARj2qC1/kwoVvc5SXkJmoDN2m1fjPWj7jVgHG8cWI=";
|
||||
hash = "sha256-MYtrCjWuTEM8sYiDWbCL+BJVtdWuItduqEb4LQGiovs=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -25,6 +25,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
substituteInPlace rtl-sdr.rules \
|
||||
--replace 'MODE:="0666"' 'ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev"'
|
||||
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail "cmake_minimum_required(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "schismtracker";
|
||||
version = "20250825";
|
||||
version = "20251014";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "schismtracker";
|
||||
repo = "schismtracker";
|
||||
tag = version;
|
||||
hash = "sha256-R1u0ZIWt4sG9cVhG9WhLdYVwAy7u62AT7E4ZwiTw1rY=";
|
||||
hash = "sha256-N1wCOR7Su3PllzrffkwB6LfhZlol1/4dVegySzJlH28=";
|
||||
};
|
||||
|
||||
# If we let it try to get the version from git, it will fail and fall back
|
||||
|
||||
@@ -121,6 +121,16 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
url = "https://github.com/scribusproject/scribus/commit/13fc4f874354511e05bf91a48703b57b4c489715.patch";
|
||||
hash = "sha256-+pbQ77SaTh04QX55wmS6WeuZf3IGe5nq3pmrhk68tb8=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "fix-build-poppler-25.09.0.patch";
|
||||
url = "https://github.com/scribusproject/scribus/commit/f0cfe30019a514bdaf38b78590451e2c5b9b5420.patch";
|
||||
hash = "sha256-ONQ3BzGhouO+0zqYUObuJC3NUCFi1PWq6qoRvuSZJws=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "fix-build-poppler-25.10.0.patch";
|
||||
url = "https://github.com/scribusproject/scribus/commit/3c1fc34fae1aa26fceb65b6bdf631a7f00b03c3c.patch";
|
||||
hash = "sha256-xTwzbT3h4+5hb6Y/sNmzkfDN2LJGOLP1v/WBVsmZXkk=";
|
||||
})
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "starship";
|
||||
version = "1.23.0";
|
||||
version = "1.24.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "starship";
|
||||
repo = "starship";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-5Euhbuu1uiJ5HJNlPs9sUoGcc5QWqXqNmEH0jpfGLlc=";
|
||||
hash = "sha256-kb7LHEhtVXzdoRPWMb4JA2REc/V5n21iX+ussWCaaPA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
@@ -44,7 +44,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
''
|
||||
);
|
||||
|
||||
cargoHash = "sha256-cxDWaPlNK7POJ3GhA21NlJ6q62bqHdA/4sru5pLkvOA=";
|
||||
cargoHash = "sha256-xd3rYRJzJspmaQAsTw0lQifHdzB++BtJAjE12GsrLdE=";
|
||||
|
||||
nativeCheckInputs = [
|
||||
gitMinimal
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "supabase-cli";
|
||||
version = "2.50.3";
|
||||
version = "2.53.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "supabase";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ydo3f7TRhHwyrWrKxCT0wFXT5v5NSmoCMRjWf43MizM=";
|
||||
hash = "sha256-U91G/5eWj+ZHCq9GU9R+gSYhwez99xi6t4VWsnYpjtI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-SJisDIpk/xiPffhtA2wKRfftODnchnaOL0wCrLx94k0=";
|
||||
vendorHash = "sha256-ST1j+UXGs3mBf5NYe+sp+QXjHsey9ATOFdriIEBJpKM=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "templ";
|
||||
version = "0.3.943";
|
||||
version = "0.3.960";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "a-h";
|
||||
repo = "templ";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-7owKjFrIHi5+RhWXzUTWwwxFLu9RNmq2g3SUf9RuDDc=";
|
||||
hash = "sha256-GCbqaRC9KipGdGfgnGjJu04/rJlg+2lgi2vluP05EV4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-pVZjZCXT/xhBCMyZdR7kEmB9jqhTwRISFp63bQf6w5A=";
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "tideways-cli";
|
||||
version = "1.2.12";
|
||||
version = "1.2.14";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
@@ -38,19 +38,19 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
sources = {
|
||||
"x86_64-linux" = fetchurl {
|
||||
url = "https://s3-eu-west-1.amazonaws.com/tideways/cli/${finalAttrs.version}/tideways-cli_linux_amd64-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-SsXVDNXaxppF9E9CGJBwdWoseV7YXbuWfsVrkB+R5To=";
|
||||
hash = "sha256-fx8h/JmVS+s2Gzk2bUQre+MfOBCuXlVHekaskIdk1c8=";
|
||||
};
|
||||
"aarch64-linux" = fetchurl {
|
||||
url = "https://s3-eu-west-1.amazonaws.com/tideways/cli/${finalAttrs.version}/tideways-cli_linux_arm64-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-MUUsDNN03i3+ZrKLKptex+P7SWjZ+YIUkXHkZf21Q+0=";
|
||||
hash = "sha256-8inyaKajz3OAegXOevNfrMYFmH9shCvtCM4OEpgi6UE=";
|
||||
};
|
||||
"x86_64-darwin" = fetchurl {
|
||||
url = "https://s3-eu-west-1.amazonaws.com/tideways/cli/${finalAttrs.version}/tideways-cli_macos_amd64-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-ue0RV57rpL5KIhCEVy6/J3cwZKOEg5Kq+490ABJrxXE=";
|
||||
hash = "sha256-tLN4B4JNKr7+V1ZgVKZEcRpfYwLNB84D3ix2vGINnXg=";
|
||||
};
|
||||
"aarch64-darwin" = fetchurl {
|
||||
url = "https://s3-eu-west-1.amazonaws.com/tideways/cli/${finalAttrs.version}/tideways-cli_macos_arm64-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-OEtEjo8/qFt/iQlUBho7G5uBdCqFrHWpoTXrCzyO/oo=";
|
||||
hash = "sha256-fcpN/YvpmZA/EFxfqWWVTfF6RcwgePf0JZ4430bPLTU=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -1,67 +0,0 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
python3,
|
||||
enableModTool ? true,
|
||||
removeReferencesTo,
|
||||
fetchpatch,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "volk";
|
||||
# Version 2.5.1 seems to cause a build issue for aarch64-darwin[1], and for
|
||||
# gnuradio 3.8 on all platforms[2]. Hence we pin this package to 2.5.0 and
|
||||
# use it for GR 3.8 for all platforms.
|
||||
#
|
||||
# [1]: https://github.com/NixOS/nixpkgs/pull/160152#issuecomment-1043380478A
|
||||
# [2]: https://github.com/NixOS/nixpkgs/pull/330477#issuecomment-2254477735
|
||||
version = "2.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gnuradio";
|
||||
repo = "volk";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-XvX6emv30bSB29EFm6aC+j8NGOxWqHCNv0Hxtdrq/jc=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://raw.githubusercontent.com/macports/macports-ports/e83a55ef196d4283be438c052295b2fc44f3df5b/science/volk/files/patch-cpu_features-add-support-for-ARM64.diff";
|
||||
hash = "sha256-MNUntVvKZC4zuQsxGQCItaUaaQ1d31re2qjyPFbySmI=";
|
||||
extraPrefix = "";
|
||||
})
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "ENABLE_MODTOOL" enableModTool)
|
||||
]
|
||||
++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
|
||||
# offset 14335 in1: -1.03372 in2: -1.03371 tolerance was: 1e-05
|
||||
# volk_32f_log2_32f: fail on arch neon
|
||||
"-DCMAKE_CTEST_ARGUMENTS=--exclude-regex;qa_volk_32f_log2_32f"
|
||||
];
|
||||
|
||||
postInstall = lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
|
||||
remove-references-to -t ${stdenv.cc} $(readlink -f $out/lib/libvolk.so)
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
python3
|
||||
python3.pkgs.mako
|
||||
python3.pkgs.distutils
|
||||
removeReferencesTo
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = {
|
||||
homepage = "http://libvolk.org/";
|
||||
description = "Vector Optimized Library of Kernels (version 2.5.0 - for GR 3.8)";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ doronbehar ];
|
||||
};
|
||||
})
|
||||
@@ -30,14 +30,14 @@ let
|
||||
# https://dldir1.qq.com/weixin/mac/mac-release.xml
|
||||
any-darwin =
|
||||
let
|
||||
version = "4.1.0.34-29721";
|
||||
version = "4.1.2.16-30516";
|
||||
version' = lib.replaceString "-" "_" version;
|
||||
in
|
||||
{
|
||||
inherit version;
|
||||
src = fetchurl {
|
||||
url = "https://dldir1v6.qq.com/weixin/Universal/Mac/xWeChatMac_universal_${version'}.dmg";
|
||||
hash = "sha256-UwQrU4uVCKnAYXFSnlIfXQbBxyR3KNn6f1Mp4bCSAZI=";
|
||||
hash = "sha256-aMInN9sEOfEKXrRYTcHu69hzN9iO3hJ5jLvK9D0QKwU=";
|
||||
};
|
||||
};
|
||||
in
|
||||
|
||||
@@ -73,13 +73,13 @@ let
|
||||
in
|
||||
effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "whisper-cpp";
|
||||
version = "1.8.1";
|
||||
version = "1.8.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ggml-org";
|
||||
repo = "whisper.cpp";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-lE25O/C55INo4xufCSzrPFX2kyodXiKwf80kknIy1Os=";
|
||||
hash = "sha256-OU5mDnLZHmtdSEN5u0syJcU91L+NCO45f9eG6OsgFfU=";
|
||||
};
|
||||
|
||||
# The upstream download script tries to download the models to the
|
||||
|
||||
@@ -0,0 +1,22 @@
|
||||
--- a/cmake/MacroCreateLibtoolFile.cmake
|
||||
+++ b/cmake/MacroCreateLibtoolFile.cmake
|
||||
@@ -9,7 +9,7 @@
|
||||
ENDMACRO (GET_TARGET_PROPERTY_WITH_DEFAULT)
|
||||
|
||||
MACRO(CREATE_LIBTOOL_FILE _target _install_DIR)
|
||||
- GET_TARGET_PROPERTY(_target_location ${_target} LOCATION)
|
||||
+
|
||||
GET_TARGET_PROPERTY_WITH_DEFAULT(_target_static_lib ${_target} STATIC_LIB "")
|
||||
GET_TARGET_PROPERTY_WITH_DEFAULT(_target_dependency_libs ${_target} LT_DEPENDENCY_LIBS "")
|
||||
GET_TARGET_PROPERTY_WITH_DEFAULT(_target_current ${_target} LT_VERSION_CURRENT 0)
|
||||
@@ -19,8 +19,8 @@
|
||||
GET_TARGET_PROPERTY_WITH_DEFAULT(_target_shouldnotlink ${_target} LT_SHOULDNOTLINK yes)
|
||||
GET_TARGET_PROPERTY_WITH_DEFAULT(_target_dlopen ${_target} LT_DLOPEN "")
|
||||
GET_TARGET_PROPERTY_WITH_DEFAULT(_target_dlpreopen ${_target} LT_DLPREOPEN "")
|
||||
- GET_FILENAME_COMPONENT(_laname ${_target_location} NAME_WE)
|
||||
- GET_FILENAME_COMPONENT(_soname ${_target_location} NAME)
|
||||
+ SET(_laname "lib${_target}")
|
||||
+ SET(_soname "${_laname}${CMAKE_SHARED_LIBRARY_SUFFIX}")
|
||||
SET(_laname ${PROJECT_BINARY_DIR}/${_laname}.la)
|
||||
FILE(WRITE ${_laname} "# ${_laname} - a libtool library file\n")
|
||||
FILE(WRITE ${_laname} "# Generated by CMake ${CMAKE_VERSION} (like GNU libtool)\n")
|
||||
@@ -7,6 +7,7 @@
|
||||
libgsf,
|
||||
glib,
|
||||
libxml2,
|
||||
libiconvReal,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -17,7 +18,10 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1p1qxr8z5bsiq8pvlina3c8c1vjcb5d96bs3zz4jj3nb20wnsawz";
|
||||
};
|
||||
|
||||
patches = [ ./fix-include.patch ];
|
||||
patches = [
|
||||
./fix-include.patch
|
||||
./fix-libtool-location.patch
|
||||
];
|
||||
|
||||
# Newer versions of clang default to C++17, which removes some deprecated APIs such as bind1st.
|
||||
# Setting the language version to C++14 makes them available again.
|
||||
@@ -36,10 +40,16 @@ stdenv.mkDerivation rec {
|
||||
libgsf
|
||||
glib
|
||||
libxml2
|
||||
];
|
||||
]
|
||||
++ lib.optional stdenv.hostPlatform.isDarwin libiconvReal;
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = "-I${libxml2.dev}/include/libxml2";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail "cmake_minimum_required(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Excellent MS Word filter lib, used in most Office suites";
|
||||
mainProgram = "wv2-config";
|
||||
|
||||
@@ -101,7 +101,7 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "zed-editor";
|
||||
version = "0.209.5";
|
||||
version = "0.209.6";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -114,7 +114,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
owner = "zed-industries";
|
||||
repo = "zed";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-p5qKbNPf7j4HiYv+Ej7df131z8xL09egbyOUwIkYC5Q=";
|
||||
hash = "sha256-KHOex6Noths886oE62BN4NE/DCMmU5VjiP+xN2YnVmc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -134,7 +134,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
rm -r $out/git/*/candle-book/
|
||||
'';
|
||||
|
||||
cargoHash = "sha256-6LBBa6CDLrEkyazZuqDj2wj41KQnhp3NRw5AlaUtxj0=";
|
||||
cargoHash = "sha256-u/dD7qHvc+ipKd6Jy9/HtPiLMa537zKUSAbjUFMQorA=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "zsv";
|
||||
version = "0.4.4-alpha";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "liquidaty";
|
||||
repo = "zsv";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-XZE7jMQaPP2B1OIlkHucNrtiJy8wMEVY9gcc5X4FyNI=";
|
||||
hash = "sha256-o5n6pUMdirtNsLAi17+sp0xteFCfFUcr2k8q57pTW2A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ perl ];
|
||||
|
||||
@@ -1,23 +1,23 @@
|
||||
let
|
||||
version = "3.9.3";
|
||||
version = "3.9.4";
|
||||
in
|
||||
{ fetchurl }:
|
||||
{
|
||||
versionUsed = version;
|
||||
"${version}-x86_64-darwin" = fetchurl {
|
||||
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-x64-release.zip";
|
||||
hash = "sha256-QnY9KG/zFj+5o/4wdR0lETHhRn3a6l340s/ybuNWxx0=";
|
||||
hash = "sha256-8nkG1hUPn0B3r5xxBnGMjgOa66Ax3LQgVqMx+3Tj3S8=";
|
||||
};
|
||||
"${version}-aarch64-darwin" = fetchurl {
|
||||
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-arm64-release.zip";
|
||||
hash = "sha256-aMSMOV5kzd48z5aQgjjpQoJNWznz4slrXSdC8LRe8u8=";
|
||||
hash = "sha256-2gqn816Usv8l69QrfJsh1DCu5ljibaBfZQn4ThUBlIA=";
|
||||
};
|
||||
"${version}-aarch64-linux" = fetchurl {
|
||||
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-arm64-release.zip";
|
||||
hash = "sha256-iEfEhHv3eu2VjAYrzPjVlXle1ISHZxJoC69MbIMXw1Y=";
|
||||
hash = "sha256-IXkJWLbGXLV6Gjw/tQj0Tdz7d7gioJADnuR+WD/N4Og=";
|
||||
};
|
||||
"${version}-x86_64-linux" = fetchurl {
|
||||
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-x64-release.zip";
|
||||
hash = "sha256-0ZMR3rNRBKQaQNt642xJaxUDdFpcrtWkFdMitMJz8ds=";
|
||||
hash = "sha256-YbS5SI4bQlW5S+F61Iri3bI8b75ngkz4ED0LKPqKuBY=";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -7,10 +7,10 @@
|
||||
}:
|
||||
clojure.overrideAttrs (previousAttrs: {
|
||||
pname = "babashka-clojure-tools";
|
||||
version = "1.12.2.1565";
|
||||
version = "1.12.3.1577";
|
||||
|
||||
src = fetchurl {
|
||||
url = previousAttrs.src.url;
|
||||
hash = "sha256-qj0RqgIL+pgbqdMnG+vCfHirazBVA8ro2zCKOlDzYXk=";
|
||||
hash = "sha256-u/hROuiLmHPpeBroaty1YLgSCcZv6Uy+ckKK85seusw=";
|
||||
};
|
||||
})
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
buildGraalvmNativeImage (finalAttrs: {
|
||||
pname = "babashka-unwrapped";
|
||||
version = "1.12.208";
|
||||
version = "1.12.209";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/babashka/babashka/releases/download/v${finalAttrs.version}/babashka-${finalAttrs.version}-standalone.jar";
|
||||
sha256 = "sha256-2tr+MM4CNYaLpVw2q5Hx4hXnUkV4fl5T3znmq8mFycU=";
|
||||
sha256 = "sha256-Br8e011Iy+fr+MrIIRtcga98VSDKDeyRfgVTPnjBMII=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
@@ -18,11 +18,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "eccodes";
|
||||
version = "2.42.0";
|
||||
version = "2.44.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://confluence.ecmwf.int/download/attachments/45757960/eccodes-${version}-Source.tar.gz";
|
||||
hash = "sha256-YDcbNXywEd7lRtsuq6zlt+J/D4fT6kpa3eeJE3GzwSg=";
|
||||
hash = "sha256-x1+x+Rt2W2uLR3RjKopvvOyWk02wFftjwq0lYK7dRDs=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -55,13 +55,13 @@ let
|
||||
domain = "gitlab.freedesktop.org";
|
||||
owner = "poppler";
|
||||
repo = "test";
|
||||
rev = "c79c6839e859dbee6b73ac260788fa2de8618ba4";
|
||||
hash = "sha256-j66AsBUnFpO5athVgQmf4vcyXxYcJ/plJtHg+3vXG4Y=";
|
||||
rev = "9d5011815a14c157ba25bb160187842fb81579a5";
|
||||
hash = "sha256-sA5f235IJpzzzHqpwHM3zCZC2Yh0ztA6PZa84j/6tfY=";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "poppler-${suffix}";
|
||||
version = "25.07.0"; # beware: updates often break cups-filters build, check scribus too!
|
||||
version = "25.10.0"; # beware: updates often break cups-filters build, check scribus too!
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://poppler.freedesktop.org/poppler-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-xQSpBm29/r43etU87GQf2XHulsTh6Mp05snAPUbYF64=";
|
||||
hash = "sha256-a16btk2rsVeHoU2xZ1KRx6+vk4dDjMk6T7f2rsTub+A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -21,9 +21,7 @@
|
||||
buildPythonPackage rec {
|
||||
pname = "checkdmarc";
|
||||
version = "5.10.12";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "domainaware";
|
||||
@@ -32,7 +30,10 @@ buildPythonPackage rec {
|
||||
hash = "sha256-XbBdBef3+kt26XP5GDH5rgHYGh8xIjHUUVOcdeVICLs=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [ "xmltodict" ];
|
||||
pythonRelaxDeps = [
|
||||
"cryptography"
|
||||
"xmltodict"
|
||||
];
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
||||
@@ -69,10 +70,10 @@ buildPythonPackage rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "Parser for SPF and DMARC DNS records";
|
||||
mainProgram = "checkdmarc";
|
||||
homepage = "https://github.com/domainaware/checkdmarc";
|
||||
changelog = "https://github.com/domainaware/checkdmarc/blob/${src.tag}/CHANGELOG.md";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
mainProgram = "checkdmarc";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
stdenv,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
fetchpatch2,
|
||||
isPyPy,
|
||||
setuptools,
|
||||
gmp,
|
||||
@@ -30,6 +31,14 @@ buildPythonPackage rec {
|
||||
hash = "sha256-wrMN3kqLnjItoybKYeo4Pp2M0uma7Kg0JEQM8lr6OI0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch2 {
|
||||
name = "fix-to_bytes-tests.patch";
|
||||
url = "https://github.com/aleaxit/gmpy/commit/1903841667e7a6842bdead90bd7798b99de5b7be.patch?full_index=1";
|
||||
hash = "sha256-rlssUIkQ1RCRSu5eCXKJ2lNa/oIoLzf9sxJuNfDrVmk=";
|
||||
})
|
||||
];
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -8,21 +8,18 @@
|
||||
protobuf,
|
||||
pytest-asyncio,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-vision";
|
||||
version = "3.10.2";
|
||||
version = "3.11.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "google_cloud_vision";
|
||||
inherit version;
|
||||
hash = "sha256-ZJOA+quJM0QLYyv4gHLAw4KgjUmrArwLT7qCGIKuF2U=";
|
||||
hash = "sha256-w8tX3yzxUuvmLrqumx1d7/Wiauxb1uHH9n5Ev29FGPQ=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -17,14 +17,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "i-pi";
|
||||
version = "3.1.6";
|
||||
version = "3.1.7";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "i-pi";
|
||||
repo = "i-pi";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-S7UagXjltyy2E9s5yoq95KjMfpy/Pb0zoGl6z6yv2sA=";
|
||||
hash = "sha256-AeHZWzgV0pqlKNdDCuAglpTDm3M8PWKDGvPw3lyQdF8=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "iamdata";
|
||||
version = "0.1.202510241";
|
||||
version = "0.1.202510251";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloud-copilot";
|
||||
repo = "iam-data-python";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-IvNPgYjNdvMlIiLwL1rDilimAnCDn5JhwwMtY4xGXoU=";
|
||||
hash = "sha256-n+P6I36zHR19ruqsycMpeGlSjwK3mmkPiaifEB1vW+s=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "publicsuffixlist";
|
||||
version = "1.0.2.20251018";
|
||||
version = "1.0.2.20251025";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-QDIAZa0slqNRcDoJ7pOuFIzntlCfbIfNrjvPmSznYdI=";
|
||||
hash = "sha256-LDvywIPdR3bJayk8waoPzaTg48RKCurG0ZUToxtMaM8=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -3,15 +3,24 @@
|
||||
stdenv,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
|
||||
# build-system
|
||||
setuptools,
|
||||
|
||||
# dependencies
|
||||
scipy,
|
||||
numpy,
|
||||
pyqt6,
|
||||
pyopengl,
|
||||
|
||||
# buildInputs
|
||||
pyqt6,
|
||||
|
||||
# tests
|
||||
qt6,
|
||||
pytestCheckHook,
|
||||
freefont_ttf,
|
||||
makeFontsConf,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -29,7 +38,20 @@ buildPythonPackage rec {
|
||||
hash = "sha256-MUwg1v6oH2TGmJ14Hp9i6KYierJbzPggK59QaHSXHVA=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
patches = [
|
||||
# Fixes a segmentation fault in tests with Qt 6.10. See:
|
||||
# https://github.com/pyqtgraph/pyqtgraph/issues/3390
|
||||
# The patch is the merge commit of:
|
||||
# https://github.com/pyqtgraph/pyqtgraph/pull/3370
|
||||
(fetchpatch {
|
||||
url = "https://github.com/pyqtgraph/pyqtgraph/commit/bf38b8527e778c9c0bb653bc0df7bb36018dcbae.patch";
|
||||
hash = "sha256-Tv4QK/OZvmDO3MOjswjch7DpF96U1uRN0dr8NIQ7+LY=";
|
||||
})
|
||||
];
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
numpy
|
||||
@@ -69,11 +91,6 @@ buildPythonPackage rec {
|
||||
"test_rescaleData"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# Segmentation fault
|
||||
"tests/test_qpainterpathprivate.py"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Scientific Graphics and GUI Library for Python";
|
||||
homepage = "https://www.pyqtgraph.org/";
|
||||
|
||||
@@ -104,6 +104,20 @@ let
|
||||
hash = "sha256-HJY+Go1viPkSVZPEs/NyMtYJzas4mMLiIZF3kNX+WgA=";
|
||||
};
|
||||
|
||||
# FlashMLA's Blackwell (SM100) kernels were developed against CUTLASS v3.9.0
|
||||
# (since https://github.com/vllm-project/FlashMLA/commit/9c5dfab6d1746b4a27af14f440e7afd5c01ece68)
|
||||
# and are currently incompatible with CUTLASS v4.x APIs. The rest of the vLLM
|
||||
# build uses a newer CUTLASS, so we package both versions.
|
||||
# See upstream issue: https://github.com/vllm-project/vllm/issues/27425
|
||||
# See git submodule commit at:
|
||||
# https://github.com/vllm-project/FlashMLA/tree/${flashmla.src.rev}/csrc
|
||||
cutlass-flashmla = fetchFromGitHub {
|
||||
owner = "NVIDIA";
|
||||
repo = "cutlass";
|
||||
tag = "v3.9.0";
|
||||
hash = "sha256-Q6y/Z6vahASeSsfxvZDwbMFHGx8CnsF90IlveeVLO9g=";
|
||||
};
|
||||
|
||||
flashmla = stdenv.mkDerivation {
|
||||
pname = "flashmla";
|
||||
# https://github.com/vllm-project/FlashMLA/blob/${src.rev}/setup.py
|
||||
@@ -123,7 +137,7 @@ let
|
||||
# flashmla normally relies on `git submodule update` to fetch cutlass
|
||||
buildPhase = ''
|
||||
rm -rf csrc/cutlass
|
||||
ln -sf ${cutlass} csrc/cutlass
|
||||
ln -sf ${cutlass-flashmla} csrc/cutlass
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
@@ -199,19 +213,16 @@ let
|
||||
"8.9"
|
||||
"9.0"
|
||||
"9.0a"
|
||||
# Blackwell (SM100+) capabilities temporarily disabled due to CUTLASS API incompatibility
|
||||
# FlashMLA kernels require CUTLASS v4.2.1+ APIs not available in bundled v4.0.0
|
||||
# TODO: Re-enable when vLLM upgrades CUTLASS (see https://github.com/vllm-project/vllm/pull/24673)
|
||||
# "10.0"
|
||||
# "10.0a"
|
||||
# "10.1"
|
||||
# "10.1a"
|
||||
# "10.3"
|
||||
# "10.3a"
|
||||
# "12.0"
|
||||
# "12.0a"
|
||||
# "12.1"
|
||||
# "12.1a"
|
||||
"10.0"
|
||||
"10.0a"
|
||||
"10.1"
|
||||
"10.1a"
|
||||
"10.3"
|
||||
"10.3a"
|
||||
"12.0"
|
||||
"12.0a"
|
||||
"12.1"
|
||||
"12.1a"
|
||||
];
|
||||
ptx = lists.map (x: "${x}+PTX") real;
|
||||
in
|
||||
|
||||
@@ -0,0 +1,41 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
# build-system
|
||||
hatchling,
|
||||
hatch-fancy-pypi-readme,
|
||||
# dependencies
|
||||
lxml,
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "yaxmldiff";
|
||||
version = "0.2.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "latk";
|
||||
repo = "yaxmldiff.py";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-AOXnK1d+b/ae50ofBfgxiDS6Dj6TIeHMrE9ME95Yj1Q=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
hatchling
|
||||
hatch-fancy-pypi-readme
|
||||
];
|
||||
|
||||
dependencies = [ lxml ];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
meta = {
|
||||
description = "Yet Another XML Differ";
|
||||
homepage = "https://github.com/latk/yaxmldiff.py";
|
||||
changelog = "https://https://github.com/latk/yaxmldiff.py/blob/v${src.tag}/CHANGELOG.md";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ sigmanificient ];
|
||||
};
|
||||
}
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
openttd.overrideAttrs (oldAttrs: rec {
|
||||
pname = "openttd-jgrpp";
|
||||
version = "0.66.1";
|
||||
version = "0.67.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "JGRennison";
|
||||
repo = "OpenTTD-patches";
|
||||
rev = "jgrpp-${version}";
|
||||
hash = "sha256-Bw5/fy3duMQDCDfAF6hGE7eQiNo0d9Ag/afG9zM+d30=";
|
||||
hash = "sha256-GMkcf3XBotPXjZC4TdtOXzutyyIiW4haE+jNIfgozbg=";
|
||||
};
|
||||
patches = [ ];
|
||||
|
||||
|
||||
@@ -70,7 +70,7 @@ in
|
||||
};
|
||||
|
||||
tomcat11 = common {
|
||||
version = "11.0.12";
|
||||
hash = "sha256-GmW8ga7V1ME60iUlj110bC1jaZ3JagT/4z4W4y9CDFU=";
|
||||
version = "11.0.13";
|
||||
hash = "sha256-8XTIrrttJ4ZLpAgjzrBZGR0nzA7iSii2kczUFoObjs8=";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -59,14 +59,14 @@ let
|
||||
in
|
||||
{
|
||||
nextcloud31 = generic {
|
||||
version = "31.0.9";
|
||||
hash = "sha256-qrhBTMY1gco6jfRy9F60ErK4Q6lms4cCdUIbrQ1nD2g=";
|
||||
version = "31.0.10";
|
||||
hash = "sha256-6FZxPwIo8+Ju6F72+ZFetNBYwNIYML1Y7l10K+3wpmk=";
|
||||
packages = nextcloud31Packages;
|
||||
};
|
||||
|
||||
nextcloud32 = generic {
|
||||
version = "32.0.0";
|
||||
hash = "sha256-V0SNVdm4cQLxfDY0cyA0ahslj2AXxjuVjHie/ULjRaM=";
|
||||
version = "32.0.1";
|
||||
hash = "sha256-WBCwbnVng4SXPY2GOH7jn0wIbXnfqS8V/LdDqro26qk=";
|
||||
packages = nextcloud32Packages;
|
||||
};
|
||||
|
||||
|
||||
@@ -200,9 +200,9 @@
|
||||
]
|
||||
},
|
||||
"mail": {
|
||||
"hash": "sha256-BvgDPCjgc5Hl93ueobErfuREhmjdoQBqOlXYpVJM9uo=",
|
||||
"url": "https://github.com/nextcloud-releases/mail/releases/download/v5.5.10/mail-v5.5.10.tar.gz",
|
||||
"version": "5.5.10",
|
||||
"hash": "sha256-Y+xAJsRUlqZLCpMsgunm97+9pP6kAoLS8rAIm5KrVfE=",
|
||||
"url": "https://github.com/nextcloud-releases/mail/releases/download/v5.5.11/mail-v5.5.11.tar.gz",
|
||||
"version": "5.5.11",
|
||||
"description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://www.horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟢/🟡/🟠/🔴\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).",
|
||||
"homepage": "https://github.com/nextcloud/mail#readme",
|
||||
"licenses": [
|
||||
@@ -230,9 +230,9 @@
|
||||
]
|
||||
},
|
||||
"news": {
|
||||
"hash": "sha256-C4A1kb41DCS3FtConpJ+g9TBEIlaUqW9YC6Ha3bj0Yw=",
|
||||
"url": "https://github.com/nextcloud/news/releases/download/27.0.0/news.tar.gz",
|
||||
"version": "27.0.0",
|
||||
"hash": "sha256-K93swGriEwm1zBq9H7F4P2fHmTanYddFARfQp456bds=",
|
||||
"url": "https://github.com/nextcloud/news/releases/download/27.0.1/news.tar.gz",
|
||||
"version": "27.0.1",
|
||||
"description": "📰 A RSS/Atom Feed reader App for Nextcloud\n\n- 📲 Synchronize your feeds with multiple mobile or desktop [clients](https://nextcloud.github.io/news/clients/)\n- 🔄 Automatic updates of your news feeds\n- 🆓 Free and open source under AGPLv3, no ads or premium functions\n\n**System Cron is currently required for this app to work**\n\nRequirements can be found [here](https://nextcloud.github.io/news/install/#dependencies)\n\nThe Changelog is available [here](https://github.com/nextcloud/news/blob/master/CHANGELOG.md)\n\nCreate a [bug report](https://github.com/nextcloud/news/issues/new/choose)\n\nCreate a [feature request](https://github.com/nextcloud/news/discussions/new)\n\nReport a [feed issue](https://github.com/nextcloud/news/discussions/new)",
|
||||
"homepage": "https://github.com/nextcloud/news",
|
||||
"licenses": [
|
||||
@@ -380,19 +380,19 @@
|
||||
]
|
||||
},
|
||||
"tables": {
|
||||
"hash": "sha256-E68fyimEMBe0DJ2cOAIBs0+Psb8UVFFfLBZc/ESRzY8=",
|
||||
"url": "https://github.com/nextcloud-releases/tables/releases/download/v0.9.5/tables-v0.9.5.tar.gz",
|
||||
"version": "0.9.5",
|
||||
"description": "Manage data the way you need it.\n\nWith this app you are able to create your own tables with individual columns. You can start with a template or from scratch and add your wanted columns.\nYou can choose from the following column types:\n- Text line or rich text\n- Link to urls or other nextcloud resources\n- Numbers\n- Progress bar\n- Stars rating\n- Yes/No tick\n- Date and/or time\n- (Multi) selection\n\nShare your tables and views with users and groups within your cloud.\n\nHave a good time and manage whatever you want.",
|
||||
"hash": "sha256-0Dvw5BR5hfVW/bmZ4sD6RawL25jHv9bla/q7bbh1RgQ=",
|
||||
"url": "https://github.com/nextcloud-releases/tables/releases/download/v1.0.0/tables-v1.0.0.tar.gz",
|
||||
"version": "1.0.0",
|
||||
"description": "Manage data the way you need it.\n\nWith this app you are able to create your own tables with individual columns. You can start with a template or from scratch and add your wanted columns.\nYou can choose from the following column types:\n- Text line or rich text\n- Link to urls or other nextcloud resources\n- Numbers\n- Progress bar\n- Stars rating\n- Yes/No tick\n- Date and/or time\n- (Multi) selection\n- Users, groups and teams\n\nShare your tables and views with users and groups within your cloud.\n\nHave a good time and manage whatever you want.",
|
||||
"homepage": "https://github.com/nextcloud/tables",
|
||||
"licenses": [
|
||||
"agpl"
|
||||
]
|
||||
},
|
||||
"tasks": {
|
||||
"hash": "sha256-Upa3dl+b97UV3KXLlcxeS6OzFBTIW+e3U/T9QJT6Pmw=",
|
||||
"url": "https://github.com/nextcloud/tasks/releases/download/v0.16.1/tasks.tar.gz",
|
||||
"version": "0.16.1",
|
||||
"hash": "sha256-h3u9xR3zguKvVWXA7CNSde2sEdvgsT18cYAHp8dKPSg=",
|
||||
"url": "https://github.com/nextcloud/tasks/releases/download/v0.17.0/tasks.tar.gz",
|
||||
"version": "0.17.0",
|
||||
"description": "Once enabled, a new Tasks menu will appear in your Nextcloud apps menu. From there you can add and delete tasks, edit their title, description, start and due dates and mark them as important. Tasks can be shared between users. Tasks can be synchronized using CalDav (each task list is linked to an Nextcloud calendar, to sync it to your local client: Thunderbird, Evolution, KDE Kontact, iCal … - just add the calendar as a remote calendar in your client). You can download your tasks as ICS files using the download button for each calendar.",
|
||||
"homepage": "https://github.com/nextcloud/tasks/",
|
||||
"licenses": [
|
||||
|
||||
@@ -180,9 +180,9 @@
|
||||
]
|
||||
},
|
||||
"mail": {
|
||||
"hash": "sha256-BvgDPCjgc5Hl93ueobErfuREhmjdoQBqOlXYpVJM9uo=",
|
||||
"url": "https://github.com/nextcloud-releases/mail/releases/download/v5.5.10/mail-v5.5.10.tar.gz",
|
||||
"version": "5.5.10",
|
||||
"hash": "sha256-Y+xAJsRUlqZLCpMsgunm97+9pP6kAoLS8rAIm5KrVfE=",
|
||||
"url": "https://github.com/nextcloud-releases/mail/releases/download/v5.5.11/mail-v5.5.11.tar.gz",
|
||||
"version": "5.5.11",
|
||||
"description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://www.horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟢/🟡/🟠/🔴\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).",
|
||||
"homepage": "https://github.com/nextcloud/mail#readme",
|
||||
"licenses": [
|
||||
@@ -200,9 +200,9 @@
|
||||
]
|
||||
},
|
||||
"news": {
|
||||
"hash": "sha256-C4A1kb41DCS3FtConpJ+g9TBEIlaUqW9YC6Ha3bj0Yw=",
|
||||
"url": "https://github.com/nextcloud/news/releases/download/27.0.0/news.tar.gz",
|
||||
"version": "27.0.0",
|
||||
"hash": "sha256-K93swGriEwm1zBq9H7F4P2fHmTanYddFARfQp456bds=",
|
||||
"url": "https://github.com/nextcloud/news/releases/download/27.0.1/news.tar.gz",
|
||||
"version": "27.0.1",
|
||||
"description": "📰 A RSS/Atom Feed reader App for Nextcloud\n\n- 📲 Synchronize your feeds with multiple mobile or desktop [clients](https://nextcloud.github.io/news/clients/)\n- 🔄 Automatic updates of your news feeds\n- 🆓 Free and open source under AGPLv3, no ads or premium functions\n\n**System Cron is currently required for this app to work**\n\nRequirements can be found [here](https://nextcloud.github.io/news/install/#dependencies)\n\nThe Changelog is available [here](https://github.com/nextcloud/news/blob/master/CHANGELOG.md)\n\nCreate a [bug report](https://github.com/nextcloud/news/issues/new/choose)\n\nCreate a [feature request](https://github.com/nextcloud/news/discussions/new)\n\nReport a [feed issue](https://github.com/nextcloud/news/discussions/new)",
|
||||
"homepage": "https://github.com/nextcloud/news",
|
||||
"licenses": [
|
||||
@@ -340,19 +340,19 @@
|
||||
]
|
||||
},
|
||||
"tables": {
|
||||
"hash": "sha256-E68fyimEMBe0DJ2cOAIBs0+Psb8UVFFfLBZc/ESRzY8=",
|
||||
"url": "https://github.com/nextcloud-releases/tables/releases/download/v0.9.5/tables-v0.9.5.tar.gz",
|
||||
"version": "0.9.5",
|
||||
"description": "Manage data the way you need it.\n\nWith this app you are able to create your own tables with individual columns. You can start with a template or from scratch and add your wanted columns.\nYou can choose from the following column types:\n- Text line or rich text\n- Link to urls or other nextcloud resources\n- Numbers\n- Progress bar\n- Stars rating\n- Yes/No tick\n- Date and/or time\n- (Multi) selection\n\nShare your tables and views with users and groups within your cloud.\n\nHave a good time and manage whatever you want.",
|
||||
"hash": "sha256-0Dvw5BR5hfVW/bmZ4sD6RawL25jHv9bla/q7bbh1RgQ=",
|
||||
"url": "https://github.com/nextcloud-releases/tables/releases/download/v1.0.0/tables-v1.0.0.tar.gz",
|
||||
"version": "1.0.0",
|
||||
"description": "Manage data the way you need it.\n\nWith this app you are able to create your own tables with individual columns. You can start with a template or from scratch and add your wanted columns.\nYou can choose from the following column types:\n- Text line or rich text\n- Link to urls or other nextcloud resources\n- Numbers\n- Progress bar\n- Stars rating\n- Yes/No tick\n- Date and/or time\n- (Multi) selection\n- Users, groups and teams\n\nShare your tables and views with users and groups within your cloud.\n\nHave a good time and manage whatever you want.",
|
||||
"homepage": "https://github.com/nextcloud/tables",
|
||||
"licenses": [
|
||||
"agpl"
|
||||
]
|
||||
},
|
||||
"tasks": {
|
||||
"hash": "sha256-Upa3dl+b97UV3KXLlcxeS6OzFBTIW+e3U/T9QJT6Pmw=",
|
||||
"url": "https://github.com/nextcloud/tasks/releases/download/v0.16.1/tasks.tar.gz",
|
||||
"version": "0.16.1",
|
||||
"hash": "sha256-h3u9xR3zguKvVWXA7CNSde2sEdvgsT18cYAHp8dKPSg=",
|
||||
"url": "https://github.com/nextcloud/tasks/releases/download/v0.17.0/tasks.tar.gz",
|
||||
"version": "0.17.0",
|
||||
"description": "Once enabled, a new Tasks menu will appear in your Nextcloud apps menu. From there you can add and delete tasks, edit their title, description, start and due dates and mark them as important. Tasks can be shared between users. Tasks can be synchronized using CalDav (each task list is linked to an Nextcloud calendar, to sync it to your local client: Thunderbird, Evolution, KDE Kontact, iCal … - just add the calendar as a remote calendar in your client). You can download your tasks as ICS files using the download button for each calendar.",
|
||||
"homepage": "https://github.com/nextcloud/tasks/",
|
||||
"licenses": [
|
||||
|
||||
@@ -6,11 +6,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mssql-jdbc";
|
||||
version = "13.2.0";
|
||||
version = "13.2.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Microsoft/mssql-jdbc/releases/download/v${version}/mssql-jdbc-${version}.jre8.jar";
|
||||
sha256 = "sha256-zC6aTII/79PMJvLY9wEw7EhaUwhZ4F6H2N7zcr7mzKc=";
|
||||
sha256 = "sha256-dgOW6pYXDM7p60FoQjFBdbZUoUhDmjSmH+0Ud2SFsBk=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@@ -62,11 +62,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rsyslog";
|
||||
version = "8.2508.0";
|
||||
version = "8.2510.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.rsyslog.com/files/download/rsyslog/${pname}-${version}.tar.gz";
|
||||
hash = "sha256-yJsedNNtDKSpW3Shq+Nu0LH6rIt8i+RxqEFc+ndiBv0=";
|
||||
hash = "sha256-pwqYNBhoWVOaak0cez9owjiX6AWCm3ZKRekssMyV5mo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -2762,6 +2762,7 @@ mapAliases {
|
||||
vmware-horizon-client = throw "'vmware-horizon-client' has been renamed to 'omnissa-horizon-client'"; # Added 2025-04-24
|
||||
vocal = throw "'vocal' has been archived upstream. Consider using 'gnome-podcasts' or 'kasts' instead."; # Added 2025-04-12
|
||||
void = throw "'void' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
|
||||
volk_2 = throw "'volk_2' has been removed after not being used by any package for a long time"; # Added 2025-10-25
|
||||
volnoti = throw "'volnoti' has been removed due to lack of maintenance upstream."; # Added 2024-12-04
|
||||
voxelands = throw "'voxelands' has been removed due to lack of upstream maintenance"; # Added 2025-08-30
|
||||
vtk_9 = lib.warnOnInstantiate "'vtk_9' has been renamed to 'vtk_9_5'" vtk_9_5; # Added 2025-07-18
|
||||
|
||||
@@ -20456,6 +20456,8 @@ self: super: with self; {
|
||||
|
||||
yattag = callPackage ../development/python-modules/yattag { };
|
||||
|
||||
yaxmldiff = callPackage ../development/python-modules/yaxmldiff { };
|
||||
|
||||
ydata-profiling = callPackage ../development/python-modules/ydata-profiling { };
|
||||
|
||||
ydiff = callPackage ../development/python-modules/ydiff { };
|
||||
|
||||
Reference in New Issue
Block a user